mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-26 00:21:17 +00:00
namespaces: mqueue namespace: adapt sysctl
Largely inspired from ipc/ipc_sysctl.c. This patch isolates the mqueue sysctl stuff in its own file. [akpm@linux-foundation.org: build fix] Signed-off-by: Cedric Le Goater <clg@fr.ibm.com> Signed-off-by: Nadia Derbey <Nadia.Derbey@bull.net> Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Cc: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
7eafd7c74c
commit
bdc8e5f85f
5 changed files with 138 additions and 64 deletions
65
ipc/mqueue.c
65
ipc/mqueue.c
|
@ -47,15 +47,6 @@
|
|||
#define STATE_PENDING 1
|
||||
#define STATE_READY 2
|
||||
|
||||
/*
|
||||
* Define the ranges various user-specified maximum values can
|
||||
* be set to.
|
||||
*/
|
||||
#define MIN_MSGMAX 1 /* min value for msg_max */
|
||||
#define MAX_MSGMAX HARD_MSGMAX /* max value for msg_max */
|
||||
#define MIN_MSGSIZEMAX 128 /* min value for msgsize_max */
|
||||
#define MAX_MSGSIZEMAX (8192*128) /* max value for msgsize_max */
|
||||
|
||||
struct ext_wait_queue { /* queue of sleeping tasks */
|
||||
struct task_struct *task;
|
||||
struct list_head list;
|
||||
|
@ -1271,60 +1262,6 @@ void mq_put_mnt(struct ipc_namespace *ns)
|
|||
mntput(ns->mq_mnt);
|
||||
}
|
||||
|
||||
static int msg_max_limit_min = MIN_MSGMAX;
|
||||
static int msg_max_limit_max = MAX_MSGMAX;
|
||||
|
||||
static int msg_maxsize_limit_min = MIN_MSGSIZEMAX;
|
||||
static int msg_maxsize_limit_max = MAX_MSGSIZEMAX;
|
||||
|
||||
static ctl_table mq_sysctls[] = {
|
||||
{
|
||||
.procname = "queues_max",
|
||||
.data = &init_ipc_ns.mq_queues_max,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = &proc_dointvec,
|
||||
},
|
||||
{
|
||||
.procname = "msg_max",
|
||||
.data = &init_ipc_ns.mq_msg_max,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = &proc_dointvec_minmax,
|
||||
.extra1 = &msg_max_limit_min,
|
||||
.extra2 = &msg_max_limit_max,
|
||||
},
|
||||
{
|
||||
.procname = "msgsize_max",
|
||||
.data = &init_ipc_ns.mq_msgsize_max,
|
||||
.maxlen = sizeof(int),
|
||||
.mode = 0644,
|
||||
.proc_handler = &proc_dointvec_minmax,
|
||||
.extra1 = &msg_maxsize_limit_min,
|
||||
.extra2 = &msg_maxsize_limit_max,
|
||||
},
|
||||
{ .ctl_name = 0 }
|
||||
};
|
||||
|
||||
static ctl_table mq_sysctl_dir[] = {
|
||||
{
|
||||
.procname = "mqueue",
|
||||
.mode = 0555,
|
||||
.child = mq_sysctls,
|
||||
},
|
||||
{ .ctl_name = 0 }
|
||||
};
|
||||
|
||||
static ctl_table mq_sysctl_root[] = {
|
||||
{
|
||||
.ctl_name = CTL_FS,
|
||||
.procname = "fs",
|
||||
.mode = 0555,
|
||||
.child = mq_sysctl_dir,
|
||||
},
|
||||
{ .ctl_name = 0 }
|
||||
};
|
||||
|
||||
static int __init init_mqueue_fs(void)
|
||||
{
|
||||
int error;
|
||||
|
@ -1336,7 +1273,7 @@ static int __init init_mqueue_fs(void)
|
|||
return -ENOMEM;
|
||||
|
||||
/* ignore failues - they are not fatal */
|
||||
mq_sysctl_table = register_sysctl_table(mq_sysctl_root);
|
||||
mq_sysctl_table = mq_register_sysctl_table();
|
||||
|
||||
error = register_filesystem(&mqueue_fs_type);
|
||||
if (error)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue