ipc/ipc_sysctl.c: move the definition of ipc_auto_callback()
PATCH 1/1 ipc/ipc_sysctl.c: move the definition of ipc_auto_callback()
proc_ipcauto_dointvec_minmax() is the only user of ipc_auto_callback(), since the former function is protected by CONFIG_PROC_FS, so should be the latter one.
Just move its definition down.
Signed-off-by WANG Cong <[email protected]>
Cc Eric Biederman <[email protected]>
---
ipc/ipc_sysctl.c +23 -23
@@ -26,29 +26,6 @@ static void *get_ipc(ctl_table *table)return which; } -/* -* Routine that is called when the file "auto_msgmni" has successfully been -* written. -* Two values are allowed: -* 0: unregister msgmni's callback routine from the ipc namespace notifier -* chain. This means that msgmni won't be recomputed anymore upon memory -* add/remove or ipc namespace creation/removal. -* 1: register back the callback routine. -*/ -static void ipc_auto_callback (int val) -{ -if (!val) -unregister_ipcns_notifier (current->nsproxy->ipc_ns); -else { -/* -* Re-enable automatic recomputing only if not already -* enabled. -*/ -recompute_msgmni (current->nsproxy->ipc_ns); -cond_register_ipcns_notifier (current->nsproxy->ipc_ns); - } -} -#ifdef CONFIG_PROC_FS static int proc_ipc_dointvec (ctl_table *table,int write,struct file *filp,void __user *buffer,size_t *lenp,loff_t *ppos)
@@ -94,6 +71,29 @@ static int proc_ipc_doulongvec_minmax(ctl_table *table, int write, lenp, ppos); } +/* +* Routine that is called when the file "auto_msgmni" has successfully been +* written. +* Two values are allowed: +* 0: unregister msgmni's callback routine from the ipc namespace notifier +* chain. This means that msgmni won't be recomputed anymore upon memory +* add/remove or ipc namespace creation/removal. +* 1: register back the callback routine. +*/ +static void ipc_auto_callback (int val) +{ +if (!val) +unregister_ipcns_notifier (current->nsproxy->ipc_ns); +else { +/* +* Re-enable automatic recomputing only if not already +* enabled. +*/ +recompute_msgmni (current->nsproxy->ipc_ns); +cond_register_ipcns_notifier (current->nsproxy->ipc_ns); + } +} +static int proc_ipcauto_dointvec_minmax (ctl_table *table,int write,struct file *filp,void __user *buffer,size_t *lenp,loff_t *ppos) {