diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-02-05 15:13:24 -0500 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-02-05 21:31:06 -0500 |
| commit | ea7c38fef0b774a5dc16fb0ca5935f0ae8568176 (patch) | |
| tree | beab8b32b90a57d54293eb83bd8d5f3f75c3be2c /fs/nfs/super.c | |
| parent | 6ae373394c4257bad562817aa60464ff7fe8f9c4 (diff) | |
| download | linux-stable-ea7c38fef0b774a5dc16fb0ca5935f0ae8568176.tar.gz linux-stable-ea7c38fef0b774a5dc16fb0ca5935f0ae8568176.tar.bz2 linux-stable-ea7c38fef0b774a5dc16fb0ca5935f0ae8568176.zip | |
NFSv4: Ensure we reference the inode for return-on-close in delegreturn
If we have to do a return-on-close in the delegreturn code, then
we must ensure that the inode and super block remain referenced.
Cc: Peng Tao <tao.peng@primarydata.com>
Cc: stable@vger.kernel.org # 3.17.x
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Reviewed-by: Peng Tao <tao.peng@primarydata.com>
Diffstat (limited to 'fs/nfs/super.c')
| -rw-r--r-- | fs/nfs/super.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 31a11b0e885d..368d9395d2e7 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -405,12 +405,15 @@ void __exit unregister_nfs_fs(void) unregister_filesystem(&nfs_fs_type); } -void nfs_sb_active(struct super_block *sb) +bool nfs_sb_active(struct super_block *sb) { struct nfs_server *server = NFS_SB(sb); - if (atomic_inc_return(&server->active) == 1) - atomic_inc(&sb->s_active); + if (!atomic_inc_not_zero(&sb->s_active)) + return false; + if (atomic_inc_return(&server->active) != 1) + atomic_dec(&sb->s_active); + return true; } EXPORT_SYMBOL_GPL(nfs_sb_active); |