shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: sdcardfs: add parent pointer into dentry name hash

Browse Source 
Fix following sdcardfs compilation error introduced in code
refactoring by upstream commit 8387ff2577 ("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: Amit Pundir <amit.pundir@linaro.org>
This commit is contained in:
Amit Pundir
2016-08-04 21:04:31 +05:30
committed by Dmitry Shmidt
parent b47e110e65
commit 48bc6d3a94
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/sdcardfs/dentry.c
View File

@@ -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);

2
fs/sdcardfs/lookup.c
View File

@@ -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;