diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-27 13:05:47 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-27 13:05:50 +1100 |
| commit | 2392ba280e498b196dcb164697061cbd1d857876 (patch) | |
| tree | af0cdd2eb5761838be02e702628df0f580faf561 /fs/nfs | |
| parent | 726f7f0ca15c310a908f65866c83eba61eef9be0 (diff) | |
| parent | 40216baa0101ec7ac9ce7c4f4f4d684f3a85eb93 (diff) | |
Merge remote-tracking branch 'userns/for-next'
Conflicts:
fs/dcache.c
fs/fuse/dir.c
fs/mount.h
fs/namei.c
fs/namespace.c
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/dir.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 812154aff981..96addb8ae992 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -1134,10 +1134,7 @@ out_zap_parent: if (IS_ROOT(dentry)) goto out_valid; } - /* If we have submounts, don't unhash ! */ - if (check_submounts_and_drop(dentry) != 0) - goto out_valid; - + shrink_submounts_and_drop(dentry); dput(parent); dfprintk(LOOKUPCACHE, "NFS: %s(%pd2) is invalid\n", __func__, dentry); |