From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH] oxenstored: fix del_watches and del_transactions Date: Thu, 18 Jun 2015 10:27:25 +0100 Message-ID: <1434619645.28264.33.camel@citrix.com> References: <1434569989-5774-1-git-send-email-wei.liu2@citrix.com> <745A59CD-7FD7-4DFA-A33D-032974BD7B71@citrix.com> <1434617632.28264.24.camel@citrix.com> <1434617797.28264.26.camel@citrix.com> <20150618092308.GD28194@zion.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5W7a-0001vF-83 for xen-devel@lists.xenproject.org; Thu, 18 Jun 2015 09:28:30 +0000 In-Reply-To: <20150618092308.GD28194@zion.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Wei Liu Cc: Xen-devel , Dave Scott List-Id: xen-devel@lists.xenproject.org On Thu, 2015-06-18 at 10:23 +0100, Wei Liu wrote: > On Thu, Jun 18, 2015 at 09:56:37AM +0100, Ian Campbell wrote: > > On Thu, 2015-06-18 at 09:53 +0100, Ian Campbell wrote: > > > On Wed, 2015-06-17 at 20:44 +0100, Dave Scott wrote: > > > > > On 17 Jun 2015, at 20:39, Wei Liu wrote: > > > > > > > > > > The statement to reset nb_watches should be in del_watches, not > > > > > del_transactions. > > > > > > > > > > Signed-off-by: Wei Liu > > > > > Cc: David Scott > > > > > --- > > > > > 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 > > > > > > 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. > > > > Actually, I think the ; should be on the previous line and the one on > > the old previous line should go, like the below. Look correct? > > Yes. Thanks for the fix. Pushed, thanks. > (I really shouldn't have worked after 7pm) :-D