summaryrefslogtreecommitdiffstats
path: root/fs/fuse
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-06-09 15:34:18 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-06-09 15:34:18 +0200
commit8b512d9a88875affe584bb3d2a7a235f84343b9e (patch)
tree80c46a675aeffaedd8d18e2bb6361768f4f4845a /fs/fuse
parentVFS: Add shrink_submounts() (diff)
downloadlinux-8b512d9a88875affe584bb3d2a7a235f84343b9e.tar.xz
linux-8b512d9a88875affe584bb3d2a7a235f84343b9e.zip
VFS: Remove dependency of ->umount_begin() call on MNT_FORCE
Allow filesystems to decide to perform pre-umount processing whether or not MNT_FORCE is set. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/fuse')
-rw-r--r--fs/fuse/inode.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 7627022446b2..13ebe5780c93 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -195,9 +195,10 @@ struct inode *fuse_iget(struct super_block *sb, unsigned long nodeid,
return inode;
}
-static void fuse_umount_begin(struct super_block *sb)
+static void fuse_umount_begin(struct vfsmount *vfsmnt, int flags)
{
- fuse_abort_conn(get_fuse_conn_super(sb));
+ if (flags & MNT_FORCE)
+ fuse_abort_conn(get_fuse_conn_super(vfsmnt->mnt_sb));
}
static void fuse_put_super(struct super_block *sb)