Re: [Xen-devel] [PATCH] oxenstored: fix del_watches and del_transactions

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

On Wed, 2015-06-17 at 20:44 +0100, Dave Scott wrote:
> > On 17 Jun 2015, at 20:39, Wei Liu <wei.liu2@xxxxxxxxxx> wrote:
> > 
> > The statement to reset nb_watches should be in del_watches, not
> > del_transactions.
> > 
> > Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
> > Cc: David Scott <dave.scott@xxxxxxxxxx>
> > ---
> > It was only until Ian applied previous patch that I discovered this
> > copy-n-paste  error. Sorry about this.
> 
> Oh yes I see what you mean.
> 
> Acked-by: David Scott <dave.scott@xxxxxxxxxx>

Alas:
        File "connection.ml", line 191, characters 17-19:
        Error: Syntax error

If I just need to append a ; to the moved line I can do that on commit,
if it needs e.g. wrapping in a begin/end or something then I'd best have
another patch.

Ian.


diff --git a/tools/ocaml/xenstored/connection.ml b/tools/ocaml/xenstore
index 9de4978..935939a 100644
--- a/tools/ocaml/xenstored/connection.ml
+++ b/tools/ocaml/xenstored/connection.ml
@@ -188,10 +188,10 @@ let del_watch con path token =
 
 let del_watches con =
   Hashtbl.clear con.watches
+  con.nb_watches <- 0
 
 let del_transactions con =
   Hashtbl.clear con.transactions;
-  con.nb_watches <- 0
 
 let list_watches con =
        let ll = Hashtbl.fold 



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel