diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-28 22:23:01 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-28 22:23:01 (GMT) |
commit | af8be4e4b316df36a00c1e52a9970c253783b57e (patch) | |
tree | 6d56665916e601ed6a933d6f85c22ee8512c6531 /fs/nfs/super.c | |
parent | d478376cb0dc9ab16a2b6e02fd8cd1174e724c64 (diff) | |
parent | 6758f953d05378d907a164c67934cd86183d9c88 (diff) | |
download | linux-af8be4e4b316df36a00c1e52a9970c253783b57e.tar.xz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
[PATCH] mnt_expire is protected by namespace_sem, no need for vfsmount_lock
[PATCH] do shrink_submounts() for all fs types
[PATCH] sanitize locking in mark_mounts_for_expiry() and shrink_submounts()
[PATCH] count ghost references to vfsmounts
[PATCH] reduce stack footprint in namespace.c
Diffstat (limited to 'fs/nfs/super.c')
-rw-r--r-- | fs/nfs/super.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index dd4dfcd..f921902 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -589,8 +589,6 @@ static void nfs_umount_begin(struct vfsmount *vfsmnt, int flags) struct nfs_server *server = NFS_SB(vfsmnt->mnt_sb); struct rpc_clnt *rpc; - shrink_submounts(vfsmnt, &nfs_automount_list); - if (!(flags & MNT_FORCE)) return; /* -EIO all pending I/O */ |