projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
[cascardo/linux.git]
/
security
/
selinux
/
selinuxfs.c
diff --git
a/security/selinux/selinuxfs.c
b/security/selinux/selinuxfs.c
index
2e73d32
..
00534c3
100644
(file)
--- a/
security/selinux/selinuxfs.c
+++ b/
security/selinux/selinuxfs.c
@@
-9,7
+9,6
@@
* the Free Software Foundation, version 2.
*/
* the Free Software Foundation, version 2.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/pagemap.h>
#include <linux/slab.h>
#include <linux/kernel.h>
#include <linux/pagemap.h>
#include <linux/slab.h>
@@
-1345,10
+1344,11
@@
err:
goto out;
}
goto out;
}
-static struct super_block *sel_get_sb(struct file_system_type *fs_type,
- int flags, const char *dev_name, void *data)
+static int sel_get_sb(struct file_system_type *fs_type,
+ int flags, const char *dev_name, void *data,
+ struct vfsmount *mnt)
{
{
- return get_sb_single(fs_type, flags, data, sel_fill_super);
+ return get_sb_single(fs_type, flags, data, sel_fill_super
, mnt
);
}
static struct file_system_type sel_fs_type = {
}
static struct file_system_type sel_fs_type = {