Message ID | 20240226104829.1044479-1-andrew.cooper3@citrix.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | tools/oxenstored: Re-format | expand |
On Mon, Feb 26, 2024 at 10:48 AM Andrew Cooper <andrew.cooper3@citrix.com> wrote: > > Rerun make format. Looks good, although not sure whether whitespace will be correctly preserved in email, recommend using git to push the changes. Reviewed-by: Edwin Török <edwin.torok@cloud.com> > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > --- > CC: Christian Lindig <christian.lindig@citrix.com> > CC: Edwin Török <edwin.torok@cloud.com> > CC: Rob Hoes <Rob.Hoes@citrix.com> > --- > tools/ocaml/xenstored/quota.ml | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/tools/ocaml/xenstored/quota.ml b/tools/ocaml/xenstored/quota.ml > index 1f652040d898..082cd25f26fc 100644 > --- a/tools/ocaml/xenstored/quota.ml > +++ b/tools/ocaml/xenstored/quota.ml > @@ -55,13 +55,13 @@ let _check quota id size = > raise Data_too_big > ); > if id > 0 then > - try > - let entry = DomidMap.find id quota.cur in > - if entry >= quota.maxent then ( > - warn "domain %u cannot create entry: quota reached" id; > - raise Limit_reached > - ) > - with Not_found -> () > + try > + let entry = DomidMap.find id quota.cur in > + if entry >= quota.maxent then ( > + warn "domain %u cannot create entry: quota reached" id; > + raise Limit_reached > + ) > + with Not_found -> () > > let check quota id size = > if !activate then > @@ -88,4 +88,4 @@ let merge orig_quota mod_quota dest_quota = > | diff -> update_entry dest id diff (* update with [x=x+diff] *) > in > {dest_quota with cur = DomidMap.fold fold_merge mod_quota.cur dest_quota.cur} > - (* dest_quota = dest_quota + (mod_quota - orig_quota) *) > +(* dest_quota = dest_quota + (mod_quota - orig_quota) *) > > base-commit: 8de3afc0b402bc17f65093a53e5870862707a8c7 > -- > 2.30.2 >
On 27/03/2024 3:11 pm, Edwin Torok wrote: > On Mon, Feb 26, 2024 at 10:48 AM Andrew Cooper > <andrew.cooper3@citrix.com> wrote: >> Rerun make format. > Looks good, although not sure whether whitespace will be correctly > preserved in email, recommend using git to push the changes. > Reviewed-by: Edwin Török <edwin.torok@cloud.com> Thanks. Don't worry about the patch workflow. ~Andrew
diff --git a/tools/ocaml/xenstored/quota.ml b/tools/ocaml/xenstored/quota.ml index 1f652040d898..082cd25f26fc 100644 --- a/tools/ocaml/xenstored/quota.ml +++ b/tools/ocaml/xenstored/quota.ml @@ -55,13 +55,13 @@ let _check quota id size = raise Data_too_big ); if id > 0 then - try - let entry = DomidMap.find id quota.cur in - if entry >= quota.maxent then ( - warn "domain %u cannot create entry: quota reached" id; - raise Limit_reached - ) - with Not_found -> () + try + let entry = DomidMap.find id quota.cur in + if entry >= quota.maxent then ( + warn "domain %u cannot create entry: quota reached" id; + raise Limit_reached + ) + with Not_found -> () let check quota id size = if !activate then @@ -88,4 +88,4 @@ let merge orig_quota mod_quota dest_quota = | diff -> update_entry dest id diff (* update with [x=x+diff] *) in {dest_quota with cur = DomidMap.fold fold_merge mod_quota.cur dest_quota.cur} - (* dest_quota = dest_quota + (mod_quota - orig_quota) *) +(* dest_quota = dest_quota + (mod_quota - orig_quota) *)
Rerun make format. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Christian Lindig <christian.lindig@citrix.com> CC: Edwin Török <edwin.torok@cloud.com> CC: Rob Hoes <Rob.Hoes@citrix.com> --- tools/ocaml/xenstored/quota.ml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) base-commit: 8de3afc0b402bc17f65093a53e5870862707a8c7