Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / fs / affs / amigaffs.c

diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
index 40eb5814b98c06ec4633c2c964e4a69c67db4ba3..a8f463c028ce9e9c52862e01a21de82a5b7e2f09 100644 (file)
--- a/fs/affs/amigaffs.c
+++ b/fs/affs/amigaffs.c
@@ -472,8 +472,8 @@ bool
 affs_nofilenametruncate(const struct dentry *dentry)
 {
        struct inode *inode = d_inode(dentry);
-       return AFFS_SB(inode->i_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. */