Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / fs / 9p / vfs_super.c

diff --git a/fs/9p/vfs_super.c b/fs/9p/vfs_super.c
index 872943004e595de4772f7f44fa781360d19613f9..63320d4e15d260fc0e7800d2bc0d2a54141666ff 100644 (file)
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
@@ -25,7 +25,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
@@ -256,11 +255,12 @@ static int v9fs_show_options(struct seq_file *m, struct vfsmount *mnt)
 }
 
 static void
-v9fs_umount_begin(struct super_block *sb)
+v9fs_umount_begin(struct vfsmount *vfsmnt, int flags)
 {
-       struct v9fs_session_info *v9ses = sb->s_fs_info;
+       struct v9fs_session_info *v9ses = vfsmnt->mnt_sb->s_fs_info;
 
-       v9fs_session_cancel(v9ses);
+       if (flags & MNT_FORCE)
+               v9fs_session_cancel(v9ses);
 }
 
 static struct super_operations v9fs_super_ops = {