lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drbd: check MODULE for THIS_MODULE

Browse Source 
THIS_MODULE is NULL only when drbd is compiled as built-in,
so the #ifdef CONFIG_MODULES should be #ifdef MODULE instead.

This fixes the warning:

drivers/block/drbd/drbd_main.c: In function ‘drbd_buildtag’:
drivers/block/drbd/drbd_main.c:4187:24: warning: the comparison will always evaluate as ‘true’ for the address of ‘__this_module’ will never be NULL [-Waddress]

Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Cong Wang
2012-04-03 14:13:36 +08:00
committed by Philipp Reisner
parent f6d0a8dbfd
commit bc4854bc91
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/block/drbd/drbd_main.c
View File

@@ -4365,12 +4365,11 @@ const char *drbd_buildtag(void)
static char buildtag[38] = "\0uilt-in"; static char buildtag[38] = "\0uilt-in";
if (buildtag[0] == 0) { if (buildtag[0] == 0) {
#ifdef CONFIG_MODULES #ifdef MODULE
if (THIS_MODULE != NULL) sprintf(buildtag, "srcversion: %-24s", THIS_MODULE->srcversion);
sprintf(buildtag, "srcversion: %-24s", THIS_MODULE->srcversion); #else
else buildtag[0] = 'b';
#endif #endif
buildtag[0] = 'b';
} }
return buildtag; return buildtag;