Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2015-03-26 09:02:50 +1100
committerJiri Kosina <jkosina@suse.cz>2015-03-26 11:55:49 +0100
commit0e3c7c88dc6a4543bcddfbfe1d814bc6713e5832 (patch)
tree59bb5aac7789c15257e9990879e8bba973f96362
parent7d96a60937aa38600149ca9e8e73e947d23e525b (diff)
patches.fixes/0001-NFSv4-Do-not-accept-delegated-opens-when-a-delegatio.patch (bnc#864409, bnc#924282).
-rw-r--r--patches.fixes/0001-NFSv4-Do-not-accept-delegated-opens-when-a-delegatio.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches.fixes/0001-NFSv4-Do-not-accept-delegated-opens-when-a-delegatio.patch b/patches.fixes/0001-NFSv4-Do-not-accept-delegated-opens-when-a-delegatio.patch
index a4313eb83d..e0c157f5ea 100644
--- a/patches.fixes/0001-NFSv4-Do-not-accept-delegated-opens-when-a-delegatio.patch
+++ b/patches.fixes/0001-NFSv4-Do-not-accept-delegated-opens-when-a-delegatio.patch
@@ -4,7 +4,7 @@ Subject: [PATCH] NFSv4: Do not accept delegated opens when a delegation recall
is in effect
Git-commit: 652f89f64fabcdae9143ee2b4253cfa838fb0279
Patch-mainline: v3.2
-References: bnc#864409
+References: bnc#864409, bnc#924282
...and report the servers that try to return a delegation when the client
is using the CLAIM_DELEG_CUR open mode. That behaviour is explicitly
@@ -61,13 +61,13 @@ Acked-by: NeilBrown <neilb@suse.de>
nfs_inode_set_delegation(state->inode,
data->owner->so_cred,
&data->o_res);
-@@ -1461,12 +1469,10 @@ static void nfs4_open_prepare(struct rpc
+@@ -1461,12 +1469,9 @@ static void nfs4_open_prepare(struct rpc
goto out_no_action;
rcu_read_lock();
delegation = rcu_dereference(NFS_I(data->state->inode)->delegation);
- if (delegation != NULL &&
+ if (data->o_arg.claim != NFS4_OPEN_CLAIM_DELEGATE_CUR &&
- test_bit(NFS_DELEGATION_RETURNING, &delegation->flags) == 0 &&
+- test_bit(NFS_DELEGATION_RETURNING, &delegation->flags) == 0 &&
- test_bit(NFS_DELEGATION_NEED_RECLAIM, &delegation->flags) == 0) {
- rcu_read_unlock();
- goto out_no_action;