diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-07-29 18:23:59 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-07-29 18:27:51 -0400 |
commit | d3fe19852e96aabe3084c82ec2f3fb4918ab6d1e (patch) | |
tree | 15a1acf8ef106766ed1bf7b937657be6a799745a | |
parent | e0b3f595d13b3e9ce9cdf53935e7f304c04b5b2b (diff) |
cifs, msdos, vfat, hfs+: don't bother with parent in ->d_compare()
dentry->d_sb is just as good as parent->d_sb
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/cifs/dir.c | 2 | ||||
-rw-r--r-- | fs/fat/namei_msdos.c | 2 | ||||
-rw-r--r-- | fs/fat/namei_vfat.c | 2 | ||||
-rw-r--r-- | fs/hfsplus/unicode.c | 2 | ||||
-rw-r--r-- | fs/hpfs/dentry.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index 4e532536cbc6..cf394da87cd4 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c | |||
@@ -906,7 +906,7 @@ static int cifs_ci_hash(const struct dentry *dentry, struct qstr *q) | |||
906 | static int cifs_ci_compare(const struct dentry *parent, const struct dentry *dentry, | 906 | static int cifs_ci_compare(const struct dentry *parent, const struct dentry *dentry, |
907 | unsigned int len, const char *str, const struct qstr *name) | 907 | unsigned int len, const char *str, const struct qstr *name) |
908 | { | 908 | { |
909 | struct nls_table *codepage = CIFS_SB(parent->d_sb)->local_nls; | 909 | struct nls_table *codepage = CIFS_SB(dentry->d_sb)->local_nls; |
910 | wchar_t c1, c2; | 910 | wchar_t c1, c2; |
911 | int i, l1, l2; | 911 | int i, l1, l2; |
912 | 912 | ||
diff --git a/fs/fat/namei_msdos.c b/fs/fat/namei_msdos.c index 1337c0c7527d..0f177127e4d6 100644 --- a/fs/fat/namei_msdos.c +++ b/fs/fat/namei_msdos.c | |||
@@ -165,7 +165,7 @@ static int msdos_hash(const struct dentry *dentry, struct qstr *qstr) | |||
165 | static int msdos_cmp(const struct dentry *parent, const struct dentry *dentry, | 165 | static int msdos_cmp(const struct dentry *parent, const struct dentry *dentry, |
166 | unsigned int len, const char *str, const struct qstr *name) | 166 | unsigned int len, const char *str, const struct qstr *name) |
167 | { | 167 | { |
168 | struct fat_mount_options *options = &MSDOS_SB(parent->d_sb)->options; | 168 | struct fat_mount_options *options = &MSDOS_SB(dentry->d_sb)->options; |
169 | unsigned char a_msdos_name[MSDOS_NAME], b_msdos_name[MSDOS_NAME]; | 169 | unsigned char a_msdos_name[MSDOS_NAME], b_msdos_name[MSDOS_NAME]; |
170 | int error; | 170 | int error; |
171 | 171 | ||
diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c index 6ccdf3f34f90..e60a90841381 100644 --- a/fs/fat/namei_vfat.c +++ b/fs/fat/namei_vfat.c | |||
@@ -141,7 +141,7 @@ static int vfat_hashi(const struct dentry *dentry, struct qstr *qstr) | |||
141 | static int vfat_cmpi(const struct dentry *parent, const struct dentry *dentry, | 141 | static int vfat_cmpi(const struct dentry *parent, const struct dentry *dentry, |
142 | unsigned int len, const char *str, const struct qstr *name) | 142 | unsigned int len, const char *str, const struct qstr *name) |
143 | { | 143 | { |
144 | struct nls_table *t = MSDOS_SB(parent->d_sb)->nls_io; | 144 | struct nls_table *t = MSDOS_SB(dentry->d_sb)->nls_io; |
145 | unsigned int alen, blen; | 145 | unsigned int alen, blen; |
146 | 146 | ||
147 | /* A filename cannot end in '.' or we treat it like it has none */ | 147 | /* A filename cannot end in '.' or we treat it like it has none */ |
diff --git a/fs/hfsplus/unicode.c b/fs/hfsplus/unicode.c index c13c8a240be3..509d7e231460 100644 --- a/fs/hfsplus/unicode.c +++ b/fs/hfsplus/unicode.c | |||
@@ -388,7 +388,7 @@ int hfsplus_hash_dentry(const struct dentry *dentry, struct qstr *str) | |||
388 | int hfsplus_compare_dentry(const struct dentry *parent, const struct dentry *dentry, | 388 | int hfsplus_compare_dentry(const struct dentry *parent, const struct dentry *dentry, |
389 | unsigned int len, const char *str, const struct qstr *name) | 389 | unsigned int len, const char *str, const struct qstr *name) |
390 | { | 390 | { |
391 | struct super_block *sb = parent->d_sb; | 391 | struct super_block *sb = dentry->d_sb; |
392 | int casefold, decompose, size; | 392 | int casefold, decompose, size; |
393 | int dsize1, dsize2, len1, len2; | 393 | int dsize1, dsize2, len1, len2; |
394 | const u16 *dstr1, *dstr2; | 394 | const u16 *dstr1, *dstr2; |
diff --git a/fs/hpfs/dentry.c b/fs/hpfs/dentry.c index 60e6d334d79a..a804300f4dce 100644 --- a/fs/hpfs/dentry.c +++ b/fs/hpfs/dentry.c | |||
@@ -50,7 +50,7 @@ static int hpfs_compare_dentry(const struct dentry *parent, const struct dentry | |||
50 | 50 | ||
51 | if (hpfs_chk_name(name->name, &bl)) | 51 | if (hpfs_chk_name(name->name, &bl)) |
52 | return 1; | 52 | return 1; |
53 | if (hpfs_compare_names(parent->d_sb, str, al, name->name, bl, 0)) | 53 | if (hpfs_compare_names(dentry->d_sb, str, al, name->name, bl, 0)) |
54 | return 1; | 54 | return 1; |
55 | return 0; | 55 | return 0; |
56 | } | 56 | } |