From: Al Viro Date: Sun, 24 Jul 2011 21:08:40 +0000 (-0400) Subject: btrfs: S_ISREG(mode) is not mode & S_IFREG... X-Git-Tag: v2.6.39-400.9.0~845^2~137 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=aa94610c1f45797b9e6f482e95a11a0d9513f168;p=users%2Fjedix%2Flinux-maple.git btrfs: S_ISREG(mode) is not mode & S_IFREG... Signed-off-by: Al Viro (cherry picked from commit 569254b0cc4e125ffde48780b215ecaf5f72bbf4) --- diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index fdd9e907f4cce..b3c39365f039f 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4468,7 +4468,7 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans, 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; @@ -4513,7 +4513,7 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans, 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) ||