[Drbd-dev] [Patch] drbd: check MODULE for THIS_MODULE

Cong Wang xiyou.wangcong at gmail.com
Tue Apr 3 08:13:36 CEST 2012

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]

Cc: Lars Ellenberg <drbd-dev at lists.linbit.com>
Signed-off-by: WANG Cong <xiyou.wangcong at gmail.com>

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 211fc44..96c432f 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -4183,12 +4183,11 @@ const char *drbd_buildtag(void)
 	static char buildtag[38] = "\0uilt-in";
 	if (buildtag[0] == 0) {
-			sprintf(buildtag, "srcversion: %-24s", THIS_MODULE->srcversion);
-		else
+#ifdef MODULE
+		sprintf(buildtag, "srcversion: %-24s", THIS_MODULE->srcversion);
+		buildtag[0] = 'b';
-			buildtag[0] = 'b';
 	return buildtag;

More information about the drbd-dev mailing list