Return-Path: linux-nfs-owner@vger.kernel.org Received: from mail-ve0-f174.google.com ([209.85.128.174]:33735 "EHLO mail-ve0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752016AbaCEIvX (ORCPT ); Wed, 5 Mar 2014 03:51:23 -0500 Received: by mail-ve0-f174.google.com with SMTP id oz11so725954veb.5 for ; Wed, 05 Mar 2014 00:51:22 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <1393958535.7035.1.camel@leira.trondhjem.org> References: <1393954269-3974-1-git-send-email-andros@netapp.com> <1393954269-3974-4-git-send-email-andros@netapp.com> <1393958535.7035.1.camel@leira.trondhjem.org> Date: Wed, 5 Mar 2014 03:51:22 -0500 Message-ID: Subject: Re: [PATCH 3/4] NFSv4 _nfs4_do_setattr use zero stateid on lost lock From: Andy Adamson To: Trond Myklebust Cc: NFS list Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-nfs-owner@vger.kernel.org List-ID: On Tue, Mar 4, 2014 at 1:42 PM, Trond Myklebust wrote: > On Tue, 2014-03-04 at 12:31 -0500, andros@netapp.com wrote: >> From: Andy Adamson >> >> Use the zero stateid if nfs4_select_rw_stateid indicates a lost lock (-EIO) >> >> Signed-off-by: Andy Adamson >> --- >> fs/nfs/nfs4proc.c | 18 +++++++++++------- >> 1 file changed, 11 insertions(+), 7 deletions(-) >> >> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c >> index de8e7f5..efe940c 100644 >> --- a/fs/nfs/nfs4proc.c >> +++ b/fs/nfs/nfs4proc.c >> @@ -2458,18 +2458,22 @@ static int _nfs4_do_setattr(struct inode *inode, struct rpc_cred *cred, >> truncate = (sattr->ia_valid & ATTR_SIZE) ? true : false; >> fmode = truncate ? FMODE_WRITE : FMODE_READ; >> >> - if (nfs4_copy_delegation_stateid(&arg.stateid, inode, fmode)) { >> - /* Use that stateid */ >> - } else if (truncate && state != NULL && nfs4_valid_open_stateid(state)) { >> + if (nfs4_copy_delegation_stateid(&arg.stateid, inode, fmode)) >> + /* Use delegation stateid */ >> + goto do_call; >> + if (truncate && state != NULL && nfs4_valid_open_stateid(state)) { >> struct nfs_lockowner lockowner = { >> .l_owner = current->files, >> .l_pid = current->tgid, >> }; >> - nfs4_select_rw_stateid(&arg.stateid, state, FMODE_WRITE, >> - &lockowner); >> - } else >> - nfs4_stateid_copy(&arg.stateid, &zero_stateid); >> + /* Use zero stateid if lock is lost (-EIO fall through) */ >> + if (nfs4_select_rw_stateid(&arg.stateid, state, FMODE_WRITE, >> + &lockowner) != -EIO) > > Shouldn't we fail with EBADF instead? Hmm. -EIO means lost lock, but not lost file, which is why I say we send it with a zero stateid. -->Andy > >> + goto do_call; >> + } >> + nfs4_stateid_copy(&arg.stateid, &zero_stateid); >> >> +do_call: >> status = nfs4_call_sync(server->client, server, &msg, &arg.seq_args, &res.seq_res, 1); >> if (status == 0 && state != NULL) >> renew_lease(server, timestamp); > > -- > Trond Myklebust > Linux NFS client maintainer, PrimaryData > trond.myklebust@primarydata.com > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-nfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html