Skip to contentSkip to conversation

ipc: fix warning of not used variable

PATCH NAK Jianjun Kong 3 participants 3 messages Dec 4, 2008

lore
Share & tools
lore

Jianjun Kong

author
#0 lore raw

PATCH 3/3 ipc: fix warning of not used variable

fix this warning:
ipc/ipc_sysctl.c:39: warning: ‘ipc_auto_callback’ defined but not used ipc_auto_callback() just called when CONFIG_PROC_FS was defined.

Signed-off-by Jianjun Kong <[email protected]>
---
 ipc/ipc_sysctl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
ipc/ipc_sysctl.c +1 -1
index 0dfebc5..9e42478 100644
@@ -35,6 +35,7 @@ static void *get_ipc(ctl_table *table)
  *    add/remove or ipc namespace creation/removal.
  * 1: register back the callback routine.
  */
+#ifdef CONFIG_PROC_FS
 static void ipc_auto_callback(int val)
 {
 	if (!val)

@@ -49,7 +50,6 @@ static void ipc_auto_callback(int val)
 	}
 }
 
-#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)
 {
Signature · 6 lines
1.5.6.3

-- 
Jianjun Kong | Happy Hacking
HOMEPAGE: http://kongove.cn/
GTALK: [email protected]
NAK
#1 lore raw
Quoted 10 lines · Jianjun Kong

fix this warning:
ipc/ipc_sysctl.c:39: warning: ‘ipc_auto_callback’ defined but not used ipc_auto_callback() just called when CONFIG_PROC_FS was defined.

Signed-off-by Jianjun Kong <[email protected]>
---
 ipc/ipc_sysctl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

NAK.

the proper fix, considering all the possibilities, is below.

Ingo

------------------->

Quoted 1 line

From 8f845313ba091a6041e666c611ef9bb751d91723 Mon Sep 17 00:00:00 2001

From: Ingo Molnar <[email protected]>
Date: Mon, 20 Oct 2008 09:19:55 +0200
Subject: [PATCH] fix warning in ipc/ipc_sysctl.c
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

fix this warning:

ipc/ipc_sysctl.c:39: warning: ‘ipc_auto_callback’ defined but not used

Move the already present #ifdef CONFIG_PROC_FS up by one function.

Also prepare get_ipc() for the !PROC_FS && !SYSCTL_SYSCALL case.

Signed-off-by Ingo Molnar <[email protected]>
---
 ipc/ipc_sysctl.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
ipc/ipc_sysctl.c +3 -1
index 0dfebc5..010850a 100644
@@ -18,6 +18,7 @@
 #include <linux/msg.h>
 #include "util.h"
 
+#if defined(CONFIG_PROC_FS) || defined(CONFIG_SYSCTL_SYSCALL)
 static void *get_ipc(ctl_table *table)
 {
 	char *which = table->data;

@@ -25,7 +26,9 @@ static void *get_ipc(ctl_table *table)
 	which = (which - (char *)&init_ipc_ns) + (char *)ipc_ns;
 	return which;
 }
+#endif
 
+#ifdef CONFIG_PROC_FS
 /*
  * Routine that is called when the file "auto_msgmni" has successfully been
  * written.

@@ -49,7 +52,6 @@ static void ipc_auto_callback(int val)
 	}
 }
 
-#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)
 {
#2 lore raw
Quoted 9 lines · Ingo Molnar
Quoted 6 lines · Jianjun Kong

fix this warning:
ipc/ipc_sysctl.c:39: warning: 'ipc_auto_callback' defined but not used ipc_auto_callback() just called when CONFIG_PROC_FS was defined.

Quoted 9 lines
Quoted 4 lines
Signed-off-by Jianjun Kong <[email protected]>
---
 ipc/ipc_sysctl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

NAK.

the proper fix, considering all the possibilities, is below.

Already fixed in -mm, please do search lkml archive before posting.

Thanks.