From a71c1d5d0c91d53e006727ec72feafced487f0ca Mon Sep 17 00:00:00 2001
From: Daniel Rosenberg <drosen@google.com>
Date: Wed, 23 Mar 2016 16:39:30 -0700
Subject: [PATCH] ANDROID: 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.
Signed-off-by: Daniel Rosenberg <drosen@google.com>
(cherry picked from commit 7828a50f5b5bb9a69a70371caa140c3966c31a7d)
BUG=b:27794037
TEST=Build and boot on Smaug.
Change-Id: Iffe0c882464c916b28a6eee9be90e3cf5942422c
[abrestic: removed now-unused label and local variable]
Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/335187
Reviewed-by: Daniel Rosenberg <drosen@google.com>
(cherry picked from commit 5995d73924904714b47d2204d6f7bcefd7604373)
Reviewed-on: https://chromium-review.googlesource.com/336847
---
fs/sdcardfs/Kconfig | 5 -----
fs/sdcardfs/lookup.c | 7 +------
fs/sdcardfs/main.c | 17 -----------------
fs/sdcardfs/sdcardfs.h | 6 ------
include/linux/namei.h | 3 ---
5 files changed, 1 insertion(+), 37 deletions(-)
diff --git a/fs/sdcardfs/Kconfig b/fs/sdcardfs/Kconfig
index ab25f88ebb37a..a1c103316ac79 100644
--- 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 f80abcb6b4675..a01b06a514fd9 100644
--- 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 80aa355d801e4..a6522286d7314 100644
--- 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"},
@@ -55,7 +54,6 @@ static int parse_options(struct super_block *sb, char *options, int silent,
char *p;
substring_t args[MAX_OPT_ARGS];
int option;
- char *string_option;
/* by default, we use AID_MEDIA_RW as uid, gid */
opts->fs_low_uid = AID_MEDIA_RW;
@@ -64,8 +62,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 +109,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;
@@ -132,7 +116,6 @@ static int parse_options(struct super_block *sb, char *options, int silent,
break;
/* unknown option */
default:
-invalid_option:
if (!silent) {
printk( KERN_ERR "Unrecognized mount option \"%s\" "
"or missing value", p);
diff --git a/fs/sdcardfs/sdcardfs.h b/fs/sdcardfs/sdcardfs.h
index a7fd20542f307..62c59da5ca858 100644
--- 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 1e595eb1fa9a1..c9ad7a100d052 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -55,9 +55,6 @@ 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(int, const char __user *, unsigned, struct path *);
extern int user_path_at_empty(int, const char __user *, unsigned, struct path *, int *empty);