diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2013-09-05 11:44:40 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-09-05 16:23:52 -0400 |
| commit | 13caa9fb5b4ce040379523037a0ce4ef867ee0c0 (patch) | |
| tree | 9a11420d61e35fa4f1dcc583e7629fb404369e49 /fs | |
| parent | 1191a2bdf012147c33e5fa95255974a3f7bf6e2f (diff) | |
| download | blackbird-obmc-linux-13caa9fb5b4ce040379523037a0ce4ef867ee0c0.tar.gz blackbird-obmc-linux-13caa9fb5b4ce040379523037a0ce4ef867ee0c0.zip | |
nfs: use check_submounts_and_drop()
Do have_submounts(), shrink_dcache_parent() and d_drop() atomically.
check_submounts_and_drop() can deal with negative dentries and
non-directories as well.
Non-directories can also be mounted on. And just like directories we don't
want these to disappear with invalidation.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
CC: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/dir.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index e474ca2b2bfe..7468735d299e 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1135,14 +1135,13 @@ out_zap_parent: if (inode && S_ISDIR(inode->i_mode)) { /* Purge readdir caches. */ nfs_zap_caches(inode); - /* If we have submounts, don't unhash ! */ - if (have_submounts(dentry)) - goto out_valid; if (dentry->d_flags & DCACHE_DISCONNECTED) goto out_valid; - shrink_dcache_parent(dentry); } - d_drop(dentry); + /* If we have submounts, don't unhash ! */ + if (check_submounts_and_drop(dentry) != 0) + goto out_valid; + dput(parent); dfprintk(LOOKUPCACHE, "NFS: %s(%s/%s) is invalid\n", __func__, dentry->d_parent->d_name.name, |
