diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-09 15:34:18 +0200 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-09 15:34:18 +0200 |
commit | 8b512d9a88875affe584bb3d2a7a235f84343b9e (patch) | |
tree | 80c46a675aeffaedd8d18e2bb6361768f4f4845a /fs/cifs | |
parent | VFS: Add shrink_submounts() (diff) | |
download | linux-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/cifs')
-rw-r--r-- | fs/cifs/cifsfs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index c262d8874ce9..3fdc2258f447 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -402,12 +402,14 @@ static struct quotactl_ops cifs_quotactl_ops = { #endif #ifdef CONFIG_CIFS_EXPERIMENTAL -static void cifs_umount_begin(struct super_block * sblock) +static void cifs_umount_begin(struct vfsmount * vfsmnt, int flags) { struct cifs_sb_info *cifs_sb; struct cifsTconInfo * tcon; - cifs_sb = CIFS_SB(sblock); + if (!(flags & MNT_FORCE)) + return; + cifs_sb = CIFS_SB(vfsmnt->mnt_sb); if(cifs_sb == NULL) return; |