On Mon, Apr 06, 2015 at 10:45:36AM -0400, Jeff Layton wrote: > On Mon, 06 Apr 2015 16:38:09 +0200 > Arnd Bergmann <arnd@xxxxxxxx> wrote: > > > On Monday 06 April 2015 10:04:52 Jeff Layton wrote: > > > > diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c > > > > index 665ef5a..a563ddb 100644 > > > > --- a/fs/lockd/svcsubs.c > > > > +++ b/fs/lockd/svcsubs.c > > > > @@ -31,7 +31,7 @@ > > > > static struct hlist_head nlm_files[FILE_NRHASH]; > > > > static DEFINE_MUTEX(nlm_file_mutex); > > > > > > > > -#ifdef NFSD_DEBUG > > > > +#ifdef CONFIG_SUNRPC_DEBUG > > > > > > Technically, you should use #if IS_ENABLED(CONFIG_SUNRPC_DEBUG). That's > > > supposed to help the compiler do checking of the code inside the block > > > even when it's not defined. > > > > You probably meant the right thing and wrote something else: you should use > > 'if (IS_ENABLED(CONFIG_SUNRPC_DEBUG)) { ... }' to get that effect, but that > > only works within a function. '#if IS_ENABLED(CONFIG_SUNRPC_DEBUG)' is just > > a nicer way to write '#if defined(CONFIG_SUNRPC_DEBUG) || > > defined(CONFIG_SUNRPC_DEBUG_MODULE)', which is harmless but pointless here > > as the symbol would never be set to 'm'. > > > > Arnd > > Ahh ok, good to know. Then this patch is fine as-is then. Thanks, queueing up for 4.1 and stable. --b. -- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html