From e0b3f595d13b3e9ce9cdf53935e7f304c04b5b2b Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 29 Jul 2016 18:22:49 -0400 Subject: affs ->d_compare(): don't bother with ->d_inode Use ->d_sb directly. Signed-off-by: Al Viro --- fs/affs/amigaffs.c | 4 +--- fs/affs/namei.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'fs/affs') diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c index d6c7a51c93e4..d8f217c711d3 100644 --- a/fs/affs/amigaffs.c +++ b/fs/affs/amigaffs.c @@ -472,9 +472,7 @@ affs_warning(struct super_block *sb, const char *function, const char *fmt, ...) bool affs_nofilenametruncate(const struct dentry *dentry) { - struct inode *inode = d_inode(dentry); - - return affs_test_opt(AFFS_SB(inode->i_sb)->s_flags, SF_NO_TRUNCATE); + return affs_test_opt(AFFS_SB(dentry->d_sb)->s_flags, SF_NO_TRUNCATE); } /* Check if the name is valid for a affs object. */ diff --git a/fs/affs/namei.c b/fs/affs/namei.c index eb32029bc776..27ca732680d9 100644 --- a/fs/affs/namei.c +++ b/fs/affs/namei.c @@ -136,7 +136,7 @@ affs_compare_dentry(const struct dentry *parent, const struct dentry *dentry, { return __affs_compare_dentry(len, str, name, affs_toupper, - affs_nofilenametruncate(parent)); + affs_nofilenametruncate(dentry)); } static int @@ -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) { return __affs_compare_dentry(len, str, name, affs_intl_toupper, - affs_nofilenametruncate(parent)); + affs_nofilenametruncate(dentry)); } -- cgit v1.2.3-59-g8ed1b