diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-08-19 07:14:20 +0200 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-08-19 07:14:20 +0200 |
| commit | 36319608e28701c07cad80ae3be8b0fdfb1ab40f (patch) | |
| tree | 736f3266aadba3aab847d8d220a2d9f7f7481944 /fs/nfs | |
| parent | NFSv4.1/pnfs: Play safe w.r.t. close() races when return-on-close is set (diff) | |
| download | linux-36319608e28701c07cad80ae3be8b0fdfb1ab40f.tar.xz linux-36319608e28701c07cad80ae3be8b0fdfb1ab40f.zip | |
Revert "NFSv4: Remove incorrect check in can_open_delegated()"
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>
Cc: stable@vger.kernel # v4.0+
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
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 9e9f7816cf24..95c5e8d39bef 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -1156,6 +1156,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); |