summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2016-09-22 13:38:55 -0400
committerAnna Schumaker <Anna.Schumaker@Netapp.com>2016-09-27 14:32:41 -0400
commit4c8e5447465c9cf92ff1c5e36e8f316b69d46aa8 (patch)
tree05a69a717159914057cf65944819c35d89fdef2a /fs
parentaa05c87f23efe417adc7ff9b4193b7201ec0dd79 (diff)
downloadlinux-4c8e5447465c9cf92ff1c5e36e8f316b69d46aa8.tar.gz
linux-4c8e5447465c9cf92ff1c5e36e8f316b69d46aa8.tar.bz2
linux-4c8e5447465c9cf92ff1c5e36e8f316b69d46aa8.zip
NFSv4.1: Don't check delegations that are already marked as revoked
If the delegation has been marked as revoked, we don't have to test it, because we should already have called FREE_STATEID on it. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Tested-by: Olek Drokin <green@linuxhacker.ru> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4proc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 9369639fef05..6bbcd2f24e22 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2423,6 +2423,11 @@ static void nfs41_check_delegation_stateid(struct nfs4_state *state)
rcu_read_unlock();
return;
}
+ if (test_bit(NFS_DELEGATION_REVOKED, &delegation->flags)) {
+ rcu_read_unlock();
+ nfs_finish_clear_delegation_stateid(state);
+ return;
+ }
nfs4_stateid_copy(&stateid, &delegation->stateid);
cred = get_rpccred(delegation->cred);