Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c2c3b4a authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

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: default avatarWANG Cong <wangcong@zeuux.org>
Cc: Eric Biederman <ebiederm@xmision.com>
Cc: Nadia Derbey <Nadia.Derbey@bull.net>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e953ac21

ipc/ipc_sysctl.c

+23 −23
Original line number Diff line number Diff line
@@ -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)

{