Return-Path: Date: Tue, 29 Dec 2015 08:37:38 -0500 From: Jeff Layton To: Benjamin Coddington Cc: Trond Myklebust , Anna Schumaker , "J. Bruce Fields" , Christoph Hellwig , linux-nfs@vger.kernel.org Subject: Re: [PATCH v3 04/10] NFSv4: Pass nfs_open_context instead of nfs4_state to nfs4_proc_unlck() Message-ID: <20151229083738.50fc7169@tlielax.poochiereds.net> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII List-ID: On Mon, 28 Dec 2015 11:28:00 -0500 Benjamin Coddington wrote: > nfs4_proc_unlk() acquires the nfs_open_context from the file_lock's > fl_file->private, but we will not always have a referenced fl_file in this > path. Instead, pass along the nfs_open_context from the call to > nfs4_proc_lock(). This allows us to use nfs4_proc_unlck() without a > valid reference in fl_file. > > Signed-off-by: Benjamin Coddington > --- > fs/nfs/nfs4proc.c | 8 +++++--- > 1 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c > index 784ba4e..279c8b3 100644 > --- a/fs/nfs/nfs4proc.c > +++ b/fs/nfs/nfs4proc.c > @@ -5656,8 +5656,10 @@ static struct rpc_task *nfs4_do_unlck(struct file_lock *fl, > return rpc_run_task(&task_setup_data); > } > > -static int nfs4_proc_unlck(struct nfs4_state *state, int cmd, struct file_lock *request) > +static int nfs4_proc_unlck(struct nfs_open_context *ctx, > + int cmd, struct file_lock *request) > { > + struct nfs4_state *state = ctx->state; > struct inode *inode = state->inode; > struct nfs4_state_owner *sp = state->owner; > struct nfs_inode *nfsi = NFS_I(inode); > @@ -5693,7 +5695,7 @@ static int nfs4_proc_unlck(struct nfs4_state *state, int cmd, struct file_lock * > status = -ENOMEM; > if (IS_ERR(seqid)) > goto out; > - task = nfs4_do_unlck(request, nfs_file_open_context(request->fl_file), lsp, seqid); > + task = nfs4_do_unlck(request, ctx, lsp, seqid); > status = PTR_ERR(task); > if (IS_ERR(task)) > goto out; > @@ -6117,7 +6119,7 @@ nfs4_proc_lock(struct nfs_open_context *ctx, int cmd, struct file_lock *request) > > if (request->fl_type == F_UNLCK) { > if (state != NULL) > - return nfs4_proc_unlck(state, cmd, request); > + return nfs4_proc_unlck(ctx, cmd, request); > return 0; > } > Reviewed-by: Jeff Layton