Commit bc4854bc authored Apr 03, 2012 by Cong Wang Committed by Philipp Reisner May 10, 2012

drbd: check MODULE for THIS_MODULE

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>

parent f6d0a8db

drivers/block/drbd/drbd_main.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -4365,12 +4365,11 @@ const char *drbd_buildtag(void)
		static char buildtag[38] = "\0uilt-in";

		if (buildtag[0] == 0) {
		#ifdef CONFIG_MODULES
		if (THIS_MODULE != NULL)
		#ifdef MODULE
		sprintf(buildtag, "srcversion: %-24s", THIS_MODULE->srcversion);
		else
		#endif
		#else
		buildtag[0] = 'b';
		#endif
		}

		return buildtag;