projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[powerpc.git]
/
fs
/
9p
/
vfs_super.c
diff --git
a/fs/9p/vfs_super.c
b/fs/9p/vfs_super.c
index
8729430
..
0ec42f6
100644
(file)
--- a/
fs/9p/vfs_super.c
+++ b/
fs/9p/vfs_super.c
@@
-25,7
+25,6
@@
*/
#include <linux/kernel.h>
*/
#include <linux/kernel.h>
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/fs.h>
@@
-46,7
+45,7
@@
#include "fid.h"
static void v9fs_clear_inode(struct inode *);
#include "fid.h"
static void v9fs_clear_inode(struct inode *);
-static struct super_operations v9fs_super_ops;
+static
const
struct super_operations v9fs_super_ops;
/**
* v9fs_clear_inode - release an inode
/**
* v9fs_clear_inode - release an inode
@@
-256,14
+255,15
@@
static int v9fs_show_options(struct seq_file *m, struct vfsmount *mnt)
}
static void
}
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 = {
+static
const
struct super_operations v9fs_super_ops = {
.statfs = simple_statfs,
.clear_inode = v9fs_clear_inode,
.show_options = v9fs_show_options,
.statfs = simple_statfs,
.clear_inode = v9fs_clear_inode,
.show_options = v9fs_show_options,