summaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2013-04-23 14:46:25 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-04-23 14:46:25 -0400
commitcd4c9be2c61d4d974d348743fddb8183b8185abc (patch)
treea6fac87c4b03bcce822eb615c425380dc994005e /fs/nfs
parent8188df1733d6722336e287cc859b2567ad70576a (diff)
downloadlinux-3.10-cd4c9be2c61d4d974d348743fddb8183b8185abc.tar.gz
linux-3.10-cd4c9be2c61d4d974d348743fddb8183b8185abc.tar.bz2
linux-3.10-cd4c9be2c61d4d974d348743fddb8183b8185abc.zip
NFSv4.1: Don't do a delegated open for NFS4_OPEN_CLAIM_DELEG_CUR_FH modes
If we're in a delegation recall situation, we can't do a delegated open. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4proc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index a411a53d8f4..ea50807b65d 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1543,6 +1543,7 @@ static void nfs4_open_prepare(struct rpc_task *task, void *calldata)
rcu_read_lock();
delegation = rcu_dereference(NFS_I(data->state->inode)->delegation);
if (data->o_arg.claim != NFS4_OPEN_CLAIM_DELEGATE_CUR &&
+ data->o_arg.claim != NFS4_OPEN_CLAIM_DELEG_CUR_FH &&
can_open_delegated(delegation, data->o_arg.fmode))
goto unlock_no_action;
rcu_read_unlock();