Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0b3f595 authored by Al Viro's avatar Al Viro
Browse files

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

fs/affs/amigaffs.c

+1 −3
Original line number Diff line number Diff line
@@ -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. */

fs/affs/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -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));



}