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

Commit 4658d3ad authored by Amit Pundir's avatar Amit Pundir Committed by Daniel Rosenberg
Browse files

ANDROID: sdcardfs: add parent pointer into dentry name hash 



Fix following sdcardfs compilation error introduced in code
refactoring by upstream commit 8387ff25 ("vfs: make the
string hashes salt the hash").

  CC [M]  fs/sdcardfs/dentry.o
In file included from ./include/linux/dcache.h:13:0,
                 from fs/sdcardfs/sdcardfs.h:29,
                 from fs/sdcardfs/dentry.c:21:
fs/sdcardfs/dentry.c: In function ‘sdcardfs_hash_ci’:
./include/linux/stringhash.h:38:51: error: expected expression before ‘)’ token
 #define init_name_hash(salt)  (unsigned long)(salt)
                                                   ^
fs/sdcardfs/dentry.c:138:9: note: in expansion of macro ‘init_name_hash’
  hash = init_name_hash();
         ^

Change-Id: I9feb6c075a7e953726954f5746fc009202d3121c
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
parent 86f145d3

fs/sdcardfs/dentry.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static int sdcardfs_hash_ci(const struct dentry *dentry, 
	//len = vfat_striptail_len(qstr);

	len = qstr->len;



	hash = init_name_hash();

	hash = init_name_hash(dentry);

	while (len--)

		//hash = partial_name_hash(nls_tolower(t, *name++), hash);

		hash = partial_name_hash(tolower(*name++), hash);

fs/sdcardfs/lookup.c

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ static struct dentry *__sdcardfs_lookup(struct dentry *dentry, 
	/* instatiate a new negative dentry */

	this.name = name;

	this.len = strlen(name);

	this.hash = full_name_hash(this.name, this.len);

	this.hash = full_name_hash(dentry, this.name, this.len);

	lower_dentry = d_lookup(lower_dir_dentry, &this);

	if (lower_dentry)

		goto setup_lower;