2014-07-23 11:24:08

by Andrey Skvortsov

Subject: [PATCH] staging: lustre: obdclass: fix sparse warnings about static declaration

Signed-off-by: Andrey Skvortsov <[email protected]>
---
.../lustre/lustre/obdclass/linux/linux-sysctl.c | 28 ++++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
index a4cd46b..7c6767b 100644
--- a/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
+++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c
@@ -52,7 +52,7 @@
#include "../../include/lprocfs_status.h"

#ifdef CONFIG_SYSCTL
-struct ctl_table_header *obd_table_header = NULL;
+static struct ctl_table_header *obd_table_header;
#endif


@@ -79,8 +79,8 @@ enum {
};


-int proc_set_timeout(struct ctl_table *table, int write, void __user *buffer,
- size_t *lenp, loff_t *ppos)
+static int proc_set_timeout(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
int rc;

@@ -90,8 +90,8 @@ int proc_set_timeout(struct ctl_table *table, int write, void __user *buffer,
return rc;
}

-int proc_memory_alloc(struct ctl_table *table, int write, void __user *buffer,
- size_t *lenp, loff_t *ppos)
+static int proc_memory_alloc(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
char buf[22];
int len;
@@ -114,8 +114,8 @@ int proc_memory_alloc(struct ctl_table *table, int write, void __user *buffer,
return 0;
}

-int proc_pages_alloc(struct ctl_table *table, int write, void __user *buffer,
- size_t *lenp, loff_t *ppos)
+static int proc_pages_alloc(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
char buf[22];
int len;
@@ -138,7 +138,7 @@ int proc_pages_alloc(struct ctl_table *table, int write, void __user *buffer,
return 0;
}

-int proc_mem_max(struct ctl_table *table, int write, void __user *buffer,
+static int proc_mem_max(struct ctl_table *table, int write, void __user *buffer,
size_t *lenp, loff_t *ppos)
{
char buf[22];
@@ -162,8 +162,8 @@ int proc_mem_max(struct ctl_table *table, int write, void __user *buffer,
return 0;
}

-int proc_pages_max(struct ctl_table *table, int write, void __user *buffer,
- size_t *lenp, loff_t *ppos)
+static int proc_pages_max(struct ctl_table *table, int write,
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
char buf[22];
int len;
@@ -186,7 +186,7 @@ int proc_pages_max(struct ctl_table *table, int write, void __user *buffer,
return 0;
}

-int proc_max_dirty_pages_in_mb(struct ctl_table *table, int write,
+static int proc_max_dirty_pages_in_mb(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
int rc = 0;
@@ -228,7 +228,7 @@ int proc_max_dirty_pages_in_mb(struct ctl_table *table, int write,
return rc;
}

-int proc_alloc_fail_rate(struct ctl_table *table, int write,
+static int proc_alloc_fail_rate(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
int rc = 0;
@@ -388,7 +388,7 @@ static struct ctl_table parent_table[] = {
};
#endif

-void obd_sysctl_init(void)
+static void obd_sysctl_init(void)
{
#ifdef CONFIG_SYSCTL
if (!obd_table_header)
@@ -396,7 +396,7 @@ void obd_sysctl_init(void)
#endif
}

-void obd_sysctl_clean(void)
+static void obd_sysctl_clean(void)
{
#ifdef CONFIG_SYSCTL
if (obd_table_header)
--
1.7.10.4

2014-07-24 01:19:09

by Greg Kroah-Hartman

Subject: Re: [PATCH] staging: lustre: obdclass: fix sparse warnings about static declaration

On Wed, Jul 23, 2014 at 07:23:43PM +0400, Andrey Skvortsov wrote:
> Signed-off-by: Andrey Skvortsov <[email protected]>
> ---
> .../lustre/lustre/obdclass/linux/linux-sysctl.c | 28 ++++++++++----------
> 1 file changed, 14 insertions(+), 14 deletions(-)

You obviously did not build with your patch applied, otherwise you would
not have sent it out :(

Please _ALWAYS_ test your patches, or end up with grumpy maintainers
when you break their build...

greg k-h