projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'pm-cpuidle', 'pm-opp' and 'pm-avs'
[cascardo/linux.git]
/
fs
/
hfsplus
/
unicode.c
diff --git
a/fs/hfsplus/unicode.c
b/fs/hfsplus/unicode.c
index
c13c8a2
..
e563939
100644
(file)
--- a/
fs/hfsplus/unicode.c
+++ b/
fs/hfsplus/unicode.c
@@
-385,10
+385,10
@@
int hfsplus_hash_dentry(const struct dentry *dentry, struct qstr *str)
* Composed unicode characters are decomposed and case-folding is performed
* if the appropriate bits are (un)set on the superblock.
*/
* Composed unicode characters are decomposed and case-folding is performed
* if the appropriate bits are (un)set on the superblock.
*/
-int hfsplus_compare_dentry(const struct dentry *
parent, const struct dentry *
dentry,
+int hfsplus_compare_dentry(const struct dentry *dentry,
unsigned int len, const char *str, const struct qstr *name)
{
unsigned int len, const char *str, const struct qstr *name)
{
- struct super_block *sb =
parent
->d_sb;
+ struct super_block *sb =
dentry
->d_sb;
int casefold, decompose, size;
int dsize1, dsize2, len1, len2;
const u16 *dstr1, *dstr2;
int casefold, decompose, size;
int dsize1, dsize2, len1, len2;
const u16 *dstr1, *dstr2;