aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2013-03-18 12:50:59 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-03-25 12:04:11 -0400
commitccb46e2063fe0816c3f28a8d328a9bbac7e88648 (patch)
treed380bfb9d99e82b1d0d4a3a852080501f1535d97
parent49f9a0fafd844c32f2abada047c0b9a5ba0d6255 (diff)
NFSv4.1: Use CLAIM_DELEG_CUR_FH opens when available
Now that we do CLAIM_FH opens, we may run into situations where we get a delegation but don't have perfect knowledge of the file path. When returning the delegation, we might therefore not be able to us CLAIM_DELEGATE_CUR opens to convert the delegation into OPEN stateids and locks. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/nfs4proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 732b76f703d6..06e5a72b5fa2 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1383,7 +1383,7 @@ static int _nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs
1383 int ret; 1383 int ret;
1384 1384
1385 opendata = nfs4_open_recoverdata_alloc(ctx, state, 1385 opendata = nfs4_open_recoverdata_alloc(ctx, state,
1386 NFS4_OPEN_CLAIM_DELEGATE_CUR); 1386 NFS4_OPEN_CLAIM_DELEG_CUR_FH);
1387 if (IS_ERR(opendata)) 1387 if (IS_ERR(opendata))
1388 return PTR_ERR(opendata); 1388 return PTR_ERR(opendata);
1389 nfs4_stateid_copy(&opendata->o_arg.u.delegation, stateid); 1389 nfs4_stateid_copy(&opendata->o_arg.u.delegation, stateid);