Commit e0b3f595 authored by Al Viro's avatar Al Viro

affs ->d_compare(): don't bother with ->d_inode

Use ->d_sb directly.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 15d3c589
...@@ -472,9 +472,7 @@ affs_warning(struct super_block *sb, const char *function, const char *fmt, ...) ...@@ -472,9 +472,7 @@ affs_warning(struct super_block *sb, const char *function, const char *fmt, ...)
bool bool
affs_nofilenametruncate(const struct dentry *dentry) affs_nofilenametruncate(const struct dentry *dentry)
{ {
struct inode *inode = d_inode(dentry); return affs_test_opt(AFFS_SB(dentry->d_sb)->s_flags, SF_NO_TRUNCATE);
return affs_test_opt(AFFS_SB(inode->i_sb)->s_flags, SF_NO_TRUNCATE);
} }
/* Check if the name is valid for a affs object. */ /* Check if the name is valid for a affs object. */
......
...@@ -136,7 +136,7 @@ affs_compare_dentry(const struct dentry *parent, const struct dentry *dentry, ...@@ -136,7 +136,7 @@ affs_compare_dentry(const struct dentry *parent, const struct dentry *dentry,
{ {
return __affs_compare_dentry(len, str, name, affs_toupper, return __affs_compare_dentry(len, str, name, affs_toupper,
affs_nofilenametruncate(parent)); affs_nofilenametruncate(dentry));
} }
static int static int
...@@ -144,7 +144,7 @@ affs_intl_compare_dentry(const struct dentry *parent, const struct dentry *dentr ...@@ -144,7 +144,7 @@ affs_intl_compare_dentry(const struct dentry *parent, const struct dentry *dentr
unsigned int len, const char *str, const struct qstr *name) unsigned int len, const char *str, const struct qstr *name)
{ {
return __affs_compare_dentry(len, str, name, affs_intl_toupper, return __affs_compare_dentry(len, str, name, affs_intl_toupper,
affs_nofilenametruncate(parent)); affs_nofilenametruncate(dentry));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment