sdcardfs: remove effectless config option

CONFIG_SDCARD_FS_CI_SEARCH only guards a define for
LOOKUP_CASE_INSENSITIVE, which is never used in the
kernel. Remove both, along with the option matching
that supports it.

Change-Id: I363a8f31de8ee7a7a934d75300cc9ba8176e2edf
Signed-off-by: Daniel Rosenberg <drosen@google.com>

diff --git a/fs/sdcardfs/Kconfig b/fs/sdcardfs/Kconfig
index ab25f88ebb37a574db4f4b6aea25315c5bce9e1a..a1c103316ac7946d1e5b03492d96bca69feeb640 100644 (file)
--- a/fs/sdcardfs/Kconfig
+++ b/fs/sdcardfs/Kconfig
@@ -11,8 +11,3 @@ config SDCARD_FS_FADV_NOACTIVE
        default y
        help
          Sdcardfs supports fadvise noactive mode.
-
-config SDCARD_FS_CI_SEARCH
-       tristate "sdcardfs case-insensitive search support"
-       depends on SDCARD_FS
-       default y

diff --git a/fs/sdcardfs/lookup.c b/fs/sdcardfs/lookup.c
index f80abcb6b4675f366e826f3f374b42f539947e1e..a01b06a514fd9b7ab032fbfebf846b659e1048fe 100644 (file)
--- a/fs/sdcardfs/lookup.c
+++ b/fs/sdcardfs/lookup.c
@@ -238,13 +238,8 @@ static struct dentry *__sdcardfs_lookup(struct dentry *dentry,
        lower_dir_mnt = lower_parent_path->mnt;
 
        /* Use vfs_path_lookup to check if the dentry exists or not */
-       if (sbi->options.lower_fs == LOWER_FS_EXT4) {
-               err = vfs_path_lookup(lower_dir_dentry, lower_dir_mnt, name,
-                               LOOKUP_CASE_INSENSITIVE, &lower_path);
-       } else if (sbi->options.lower_fs == LOWER_FS_FAT) {
-               err = vfs_path_lookup(lower_dir_dentry, lower_dir_mnt, name, 0,
+       err = vfs_path_lookup(lower_dir_dentry, lower_dir_mnt, name, 0,
                                &lower_path);
-       }
 
        /* no error: handle positive dentries */
        if (!err) {

diff --git a/fs/sdcardfs/main.c b/fs/sdcardfs/main.c
index 80aa355d801e4e5c609c0a94e23a404f120147e9..fa11a0458b8441f322710c304ef2399fab9da284 100644 (file)
--- a/fs/sdcardfs/main.c
+++ b/fs/sdcardfs/main.c
@@ -41,7 +41,6 @@ static const match_table_t sdcardfs_tokens = {
        {Opt_fsgid, "fsgid=%u"},
        {Opt_gid, "gid=%u"},
        {Opt_debug, "debug"},
-       {Opt_lower_fs, "lower_fs=%s"},
        {Opt_mask, "mask=%u"},
        {Opt_userid, "userid=%d"},
        {Opt_multiuser, "multiuser"},
@@ -64,8 +63,6 @@ static int parse_options(struct super_block *sb, char *options, int silent,
        opts->multiuser = false;
        opts->fs_user_id = 0;
        opts->gid = 0;
-       /* by default, we use LOWER_FS_EXT4 as lower fs type */
-       opts->lower_fs = LOWER_FS_EXT4;
        /* by default, 0MB is reserved */
        opts->reserved_mb = 0;
 
@@ -113,18 +110,6 @@ static int parse_options(struct super_block *sb, char *options, int silent,
                case Opt_multiuser:
                        opts->multiuser = true;
                        break;
-               case Opt_lower_fs:
-                       string_option = match_strdup(&args[0]);
-                       if (!strcmp("ext4", string_option)) {
-                               opts->lower_fs = LOWER_FS_EXT4;
-                       } else if (!strcmp("fat", string_option)) {
-                               opts->lower_fs = LOWER_FS_FAT;
-                       } else {
-                               kfree(string_option);
-                               goto invalid_option;
-                       }
-                       kfree(string_option);
-                       break;
                case Opt_reserved_mb:
                        if (match_int(&args[0], &option))
                                return 0;

diff --git a/fs/sdcardfs/sdcardfs.h b/fs/sdcardfs/sdcardfs.h
index 1b85f4e7032465d5797288d48d29d6468f578133..f111f898b630f3d042cd2bfcfd7a9599c42e2166 100644 (file)
--- a/fs/sdcardfs/sdcardfs.h
+++ b/fs/sdcardfs/sdcardfs.h
@@ -123,11 +123,6 @@ typedef enum {
     PERM_ANDROID_MEDIA,
 } perm_t;
 
-typedef enum {
-       LOWER_FS_EXT4,
-       LOWER_FS_FAT,
-} lower_fs_t;
-
 struct sdcardfs_sb_info;
 struct sdcardfs_mount_options;
 
@@ -191,7 +186,6 @@ struct sdcardfs_mount_options {
        gid_t fs_low_gid;
        userid_t fs_user_id;
        gid_t gid;
-       lower_fs_t lower_fs;
        mode_t mask;
        bool multiuser;
        unsigned int reserved_mb;

diff --git a/include/linux/namei.h b/include/linux/namei.h
index 47b53673ec619d53bfd737d4080b5cef2a0b8132..d53c25453aca084e9b0390473323ac9897961167 100644 (file)
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -43,7 +43,6 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};
 #define LOOKUP_JUMPED          0x1000
 #define LOOKUP_ROOT            0x2000
 #define LOOKUP_EMPTY           0x4000
-#define LOOKUP_CASE_INSENSITIVE 0x8000
 
 extern int user_path_at_empty(int, const char __user *, unsigned, struct path *, int *empty);