diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2008-04-24 13:21:56 +0200 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-04-25 15:23:25 +0200 |
commit | 42faad99658eed7ca8bd328ffa4bcb7d78c9bcca (patch) | |
tree | 8b57fb69d1922939c6ba13f512a0ae54a3a171ef /fs/namespace.c | |
parent | cifs: timeout dfs automounts +little fix. (diff) | |
download | linux-42faad99658eed7ca8bd328ffa4bcb7d78c9bcca.tar.xz linux-42faad99658eed7ca8bd328ffa4bcb7d78c9bcca.zip |
[PATCH] restore sane ->umount_begin() API
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/namespace.c')
-rw-r--r-- | fs/namespace.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 0505fb61aa74..f48f98110c30 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1061,10 +1061,11 @@ static int do_umount(struct vfsmount *mnt, int flags) * about for the moment. */ - lock_kernel(); - if (sb->s_op->umount_begin) - sb->s_op->umount_begin(mnt, flags); - unlock_kernel(); + if (flags & MNT_FORCE && sb->s_op->umount_begin) { + lock_kernel(); + sb->s_op->umount_begin(sb); + unlock_kernel(); + } /* * No sense to grab the lock for this test, but test itself looks |