2015-08-12 09:51:42

by Maxime Lorrillere

Subject: [PATCH 1/2] staging: lustre: fix static declarations in libcfs

This patch fix the following sparse warnings in libcfs/linux/linux-debug.c:
>>> linux-debug.c:64:6: warning: symbol 'lnet_upcall' was not declared. Should it be static?
>>> linux-debug.c:65:6: warning: symbol 'lnet_debug_log_upcall' was not declared. Should it be static?

Signed-off-by: Maxime Lorrillere <[email protected]>
---
drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c
index 4545d54..f0331fa 100644
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c
@@ -61,8 +61,9 @@

#include <linux/kallsyms.h>

-char lnet_upcall[1024] = "/usr/lib/lustre/lnet_upcall";
-char lnet_debug_log_upcall[1024] = "/usr/lib/lustre/lnet_debug_log_upcall";
+static char lnet_upcall[1024] = "/usr/lib/lustre/lnet_upcall";
+static char lnet_debug_log_upcall[1024] =
+ "/usr/lib/lustre/lnet_debug_log_upcall";

/**
* Upcall function once a Lustre log has been dumped.
--
2.5.0

2015-08-12 09:51:57

by Maxime Lorrillere

Subject: [PATCH 2/2] staging: lustre: fix symbol redeclared with different type in libcfs

lbug_with_loc is declared with __attribute__((noreturn)) in libcfs_private.h
and without this attribute in linux-debug.c. This generates the following
sparse error:
>>> drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c:149:6: error: symbol 'lbug_with_loc' redeclared with different type (originally declared at drivers/staging/lustre/lustre/libcfs/linux/../../../include/linux/libcfs/libcfs_private.h:82) - different modifiers

This patches removes this attribute in libcfs_private.h as it seems to me that
this optimization is not necessary.

Signed-off-by: Maxime Lorrillere <[email protected]>
---
drivers/staging/lustre/include/linux/libcfs/libcfs_private.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
index 9544860..e60b92b 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
@@ -79,7 +79,7 @@ do { \

#define KLASSERT(e) LASSERT(e)

-void lbug_with_loc(struct libcfs_debug_msg_data *)__attribute__((noreturn));
+void lbug_with_loc(struct libcfs_debug_msg_data *);

#define LBUG() \
do { \
--
2.5.0

2015-08-14 06:04:42

by Sudip Mukherjee

Subject: Re: [PATCH 1/2] staging: lustre: fix static declarations in libcfs

On Wed, Aug 12, 2015 at 11:51:04AM +0200, Maxime Lorrillere wrote:
> This patch fix the following sparse warnings in libcfs/linux/linux-debug.c:
> >>> linux-debug.c:64:6: warning: symbol 'lnet_upcall' was not declared. Should it be static?
> >>> linux-debug.c:65:6: warning: symbol 'lnet_debug_log_upcall' was not declared. Should it be static?
>
> Signed-off-by: Maxime Lorrillere <[email protected]>
> ---
You have not build tested.

WARNING: "lnet_debug_log_upcall" [drivers/staging/lustre/lustre/libcfs/libcfs.ko] undefined!
WARNING: "lnet_upcall" [drivers/staging/lustre/lustre/libcfs/libcfs.ko] undefined!

regards
sudip

2015-08-14 14:00:37

by Maxime Lorrillere

Subject: Re: [PATCH 1/2] staging: lustre: fix static declarations in libcfs

On vendredi 14 août 2015 à 11:28:35 (+0530), Sudip Mukherjee wrote
> On Wed, Aug 12, 2015 at 11:51:04AM +0200, Maxime Lorrillere wrote:
> > This patch fix the following sparse warnings in libcfs/linux/linux-debug.c:
> > >>> linux-debug.c:64:6: warning: symbol 'lnet_upcall' was not declared. Should it be static?
> > >>> linux-debug.c:65:6: warning: symbol 'lnet_debug_log_upcall' was not declared. Should it be static?
> >
> > Signed-off-by: Maxime Lorrillere <[email protected]>
> > ---
> You have not build tested.
>
> WARNING: "lnet_debug_log_upcall" [drivers/staging/lustre/lustre/libcfs/libcfs.ko] undefined!
> WARNING: "lnet_upcall" [drivers/staging/lustre/lustre/libcfs/libcfs.ko] undefined!

Sorry, I've only rebuild lustre separately.

Patch 2/2 builds fine, should I submit it separately ?

Regards,

Maxime

2015-08-15 01:49:48

by Greg Kroah-Hartman

Subject: Re: [PATCH 1/2] staging: lustre: fix static declarations in libcfs

On Fri, Aug 14, 2015 at 04:00:31PM +0200, Maxime Lorrillere wrote:
> On vendredi 14 ao?t 2015 ? 11:28:35 (+0530), Sudip Mukherjee wrote
> > On Wed, Aug 12, 2015 at 11:51:04AM +0200, Maxime Lorrillere wrote:
> > > This patch fix the following sparse warnings in libcfs/linux/linux-debug.c:
> > > >>> linux-debug.c:64:6: warning: symbol 'lnet_upcall' was not declared. Should it be static?
> > > >>> linux-debug.c:65:6: warning: symbol 'lnet_debug_log_upcall' was not declared. Should it be static?
> > >
> > > Signed-off-by: Maxime Lorrillere <[email protected]>
> > > ---
> > You have not build tested.
> >
> > WARNING: "lnet_debug_log_upcall" [drivers/staging/lustre/lustre/libcfs/libcfs.ko] undefined!
> > WARNING: "lnet_upcall" [drivers/staging/lustre/lustre/libcfs/libcfs.ko] undefined!
>
> Sorry, I've only rebuild lustre separately.
>
> Patch 2/2 builds fine, should I submit it separately ?

Yes please.