projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[deliverable/linux.git]
/
ipc
/
mqueue.c
diff --git
a/ipc/mqueue.c
b/ipc/mqueue.c
index 3a61ffefe88472af269e0bc218d6f8eb2959a1c9..035f4399edbcb8fd277285ac283db95c4188f8d5 100644
(file)
--- a/
ipc/mqueue.c
+++ b/
ipc/mqueue.c
@@
-211,13
+211,13
@@
out:
return error;
}
return error;
}
-static
int mqueue_get_sb
(struct file_system_type *fs_type,
+static
struct dentry *mqueue_mount
(struct file_system_type *fs_type,
int flags, const char *dev_name,
int flags, const char *dev_name,
- void *data
, struct vfsmount *mnt
)
+ void *data)
{
if (!(flags & MS_KERNMOUNT))
data = current->nsproxy->ipc_ns;
{
if (!(flags & MS_KERNMOUNT))
data = current->nsproxy->ipc_ns;
- return
get_sb_ns(fs_type, flags, data, mqueue_fill_super, mnt
);
+ return
mount_ns(fs_type, flags, data, mqueue_fill_super
);
}
static void init_once(void *foo)
}
static void init_once(void *foo)
@@
-1232,7
+1232,7
@@
static const struct super_operations mqueue_super_ops = {
static struct file_system_type mqueue_fs_type = {
.name = "mqueue",
static struct file_system_type mqueue_fs_type = {
.name = "mqueue",
- .
get_sb = mqueue_get_sb
,
+ .
mount = mqueue_mount
,
.kill_sb = kill_litter_super,
};
.kill_sb = kill_litter_super,
};
This page took
0.042972 seconds
and
5
git commands to generate.