fs: sdcardfs: Declare LOOKUP_CASE_INSENSITIVE unconditionally
authorGuenter Roeck <groeck@chromium.org>
Wed, 23 Mar 2016 15:32:23 +0000 (08:32 -0700)
committerDmitry Shmidt <dimitrysh@google.com>
Wed, 23 Mar 2016 21:50:36 +0000 (14:50 -0700)
Attempts to build sdcardfs as module fail with

fs/sdcardfs/lookup.c: In function '__sdcardfs_lookup':
fs/sdcardfs/lookup.c:243:5: error: 'LOOKUP_CASE_INSENSITIVE' undeclared

This occurs because the define is enclosed with #ifdef
CONFIG_SDCARD_FS_CI_SEARCH. If SDCARD_FS_CI_SEARCH is configured to be
built as module, this does not work. Alternatives would be to use #if
IS_ENABLED(CONFIG_SDCARD_FS_CI_SEARCH), or to declare SDCARD_FS_CI_SEARCH
as bool, but that does not work because the define is used unconditionally
in the source.

Note that LOOKUP_CASE_INSENSITIVE is only set but not evaluated in the
current source code, so setting the flag has no real effect.

Fixes: 84a1b7d3d312 ("Included sdcardfs source code for kernel 3.0")
Cc: Daniel Rosenberg <drosen@google.com>
Signed-off-by: Guenter Roeck <groeck@chromium.org>
include/linux/namei.h

index f2b8acbdb92825e309866108240a78f84bfa9a4e..47b53673ec619d53bfd737d4080b5cef2a0b8132 100644 (file)
@@ -43,9 +43,7 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};
 #define LOOKUP_JUMPED          0x1000
 #define LOOKUP_ROOT            0x2000
 #define LOOKUP_EMPTY           0x4000
-#ifdef CONFIG_SDCARD_FS_CI_SEARCH
 #define LOOKUP_CASE_INSENSITIVE 0x8000
-#endif
 
 extern int user_path_at_empty(int, const char __user *, unsigned, struct path *, int *empty);