commit 569254b0cc4e125ffde48780b215ecaf5f72bbf4
author Al Viro <viro@zeniv.linux.org.uk> Sun Jul 24 17:08:40 2011 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Tue Jul 26 13:05:05 2011 -0400
tree 17ff0f097c6245a2bc9ba06e9ba87ea68092b505
parent 4b2a2c67415f1ab128f1d0b340fe6d13363335e5

btrfs: S_ISREG(mode) is not mode & S_IFREG...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/btrfs/inode.c

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index e91b097..caa26ab 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4467,7 +4467,7 @@
 	inode->i_generation = BTRFS_I(inode)->generation;
 	btrfs_set_inode_space_info(root, inode);
 
-	if (mode & S_IFDIR)
+	if (S_ISDIR(mode))
 		owner = 0;
 	else
 		owner = 1;
@@ -4512,7 +4512,7 @@
 
 	btrfs_inherit_iflags(inode, dir);
 
-	if ((mode & S_IFREG)) {
+	if (S_ISREG(mode)) {
 		if (btrfs_test_opt(root, NODATASUM))
 			BTRFS_I(inode)->flags |= BTRFS_INODE_NODATASUM;
 		if (btrfs_test_opt(root, NODATACOW) ||