ANDROID: sdcardfs: Fix style issues with comments (d64126cd) · Commits · e / devices / android_kernel_fairphone_FP3

fs/sdcardfs/dentry.c

+1 −15

Original line number	Diff line number	Diff line
		@@ -127,12 +127,10 @@ static int sdcardfs_hash_ci(const struct dentry *dentry,
		unsigned long hash;

		name = qstr->name;
		//len = vfat_striptail_len(qstr);
		len = qstr->len;

		hash = init_name_hash(dentry);
		while (len--)
		//hash = partial_name_hash(nls_tolower(t, *name++), hash);
		hash = partial_name_hash(tolower(*name++), hash);
		qstr->hash = end_name_hash(hash);

		@@ -145,20 +143,8 @@ static int sdcardfs_hash_ci(const struct dentry *dentry,
		static int sdcardfs_cmp_ci(const struct dentry *dentry,
		unsigned int len, const char str, const struct qstr name)
		{
		/* This function is copy of vfat_cmpi */
		// FIXME Should we support national language?
		//struct nls_table *t = MSDOS_SB(parent->d_sb)->nls_io;
		//unsigned int alen, blen;
		/* FIXME Should we support national language? */

		/* A filename cannot end in '.' or we treat it like it has none */
		/*
		alen = vfat_striptail_len(name);
		blen = __vfat_striptail_len(len, str);
		if (alen == blen) {
		if (nls_strnicmp(t, name->name, str, alen) == 0)
		return 0;
		}
		*/
		if (name->len == len) {
		if (str_n_case_eq(name->name, str, len))
		return 0;

+3 −6

Original line number	Diff line number	Diff line
		@@ -325,9 +325,7 @@ inline void update_derived_permission_lock(struct dentry *dentry)
		* 1. need to check whether the dentry is updated or not
		* 2. remove the root dentry update
		*/
		if (IS_ROOT(dentry)) {
		//setup_default_pre_root_state(d_inode(dentry));
		} else {
		if (!IS_ROOT(dentry)) {
		parent = dget_parent(dentry);
		if (parent) {
		get_derived_permission(parent, dentry);
		@@ -377,7 +375,6 @@ int is_obbpath_invalid(struct dentry *dent)
		ret = 1;
		} else {
		path_get(&di->lower_path);
		//lower_parent = lock_parent(lower_path->dentry);

		path_buf = kmalloc(PATH_MAX, GFP_ATOMIC);
		if (!path_buf) {
		@@ -392,7 +389,6 @@ int is_obbpath_invalid(struct dentry *dent)
		kfree(path_buf);
		}

		//unlock_dir(lower_parent);
		pathcpy(&lower_path, &di->lower_path);
		need_put = 1;
		}
		@@ -438,7 +434,8 @@ int setup_obb_dentry(struct dentry dentry, struct path lower_path)

		/* A local obb dentry must have its own orig_path to support rmdir
		* and mkdir of itself. Usually, we expect that the sbi->obbpath
		* is avaiable on this stage. */
		* is avaiable on this stage.
		*/
		sdcardfs_set_orig_path(dentry, lower_path);

		err = kern_path(sbi->obbpath_s,

+1 −1