diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-08-19 00:14:20 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-09-29 19:26:10 +0200 |
| commit | d40d9de9d3533ef6607342ec153b426b9d2b892e (patch) | |
| tree | 537ad846735d9ac7eedf27b71f54dedd405b5e20 /fs/nfs | |
| parent | 3d5c6b90ed90eadcd9c66951877697d848e63ac1 (diff) | |
| download | linux-rt-d40d9de9d3533ef6607342ec153b426b9d2b892e.tar.gz | |
Revert "NFSv4: Remove incorrect check in can_open_delegated()"
commit 36319608e28701c07cad80ae3be8b0fdfb1ab40f upstream.
This reverts commit 4e379d36c050b0117b5d10048be63a44f5036115.
This commit opens up a race between the recovery code and the open code.
Reported-by: Olga Kornievskaia <aglo@umich.edu>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index d69bd6ae0ff0..c245874d7e9d 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1152,6 +1152,8 @@ static int can_open_delegated(struct nfs_delegation *delegation, fmode_t fmode) return 0; if ((delegation->type & fmode) != fmode) return 0; + if (test_bit(NFS_DELEGATION_NEED_RECLAIM, &delegation->flags)) + return 0; if (test_bit(NFS_DELEGATION_RETURNING, &delegation->flags)) return 0; nfs_mark_delegation_referenced(delegation); |