From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steve Dickson Subject: Re: [PATCH 09/15] NFS: Add label lifecycle management Date: Sat, 16 Feb 2013 15:28:57 -0500 Message-ID: <511FEC09.5040809@RedHat.com> References: <1360327163-20360-1-git-send-email-SteveD@redhat.com> <1360327163-20360-10-git-send-email-SteveD@redhat.com> <20130212222659.GK10267@fieldses.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Trond Myklebust , "J. Bruce Fields" , "David P. Quigley" , Linux NFS list , Linux FS devel list , Linux Security List , SELinux List To: "J. Bruce Fields" Return-path: Received: from mx1.redhat.com ([209.132.183.28]:53664 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754228Ab3BPU3T (ORCPT ); Sat, 16 Feb 2013 15:29:19 -0500 In-Reply-To: <20130212222659.GK10267@fieldses.org> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On 12/02/13 17:27, J. Bruce Fields wrote: >> @@ -2922,6 +2969,7 @@ static int _nfs4_proc_remove(struct inode *dir, struct qstr *name) >> > status = nfs4_call_sync(server->client, server, &msg, &args.seq_args, &res.seq_res, 1); >> > if (status == 0) >> > update_changeattr(dir, &res.cinfo); >> > + >> > return status; >> > } >> > >> > @@ -2965,6 +3013,7 @@ static int nfs4_proc_unlink_done(struct rpc_task *task, struct inode *dir) >> > if (nfs4_async_handle_error(task, res->server, NULL) == -EAGAIN) >> > return 0; >> > update_changeattr(dir, &res->cinfo); >> > + >> > return 1; >> > } >> > > How'd these two hunks end up in here? I have no idea.. but they are gone.. steved.