Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7828a50f authored by Daniel Rosenberg's avatar Daniel Rosenberg
Browse files

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: default avatarDaniel Rosenberg <drosen@google.com>
parent c7cdea07

fs/sdcardfs/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -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

fs/sdcardfs/lookup.c

+1 −6
Original line number Diff line number Diff line
@@ -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,

				&lower_path);

	}



	/* no error: handle positive dentries */

	if (!err) {

fs/sdcardfs/main.c

+0 −15
Original line number Diff line number Diff line
@@ -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;

fs/sdcardfs/sdcardfs.h

+0 −6
Original line number Diff line number Diff line
@@ -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;

include/linux/namei.h

+0 −3
Original line number Diff line number Diff line
@@ -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);