summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro2011-07-24 23:08:40 +0200
committerAl Viro2011-07-26 19:05:05 +0200
commit569254b0cc4e125ffde48780b215ecaf5f72bbf4 (patch)
tree17ff0f097c6245a2bc9ba06e9ba87ea68092b505
parentima: fmode_t misspelled as mode_t... (diff)
downloadkernel-qcow2-linux-569254b0cc4e125ffde48780b215ecaf5f72bbf4.tar.gz
kernel-qcow2-linux-569254b0cc4e125ffde48780b215ecaf5f72bbf4.tar.xz
kernel-qcow2-linux-569254b0cc4e125ffde48780b215ecaf5f72bbf4.zip
btrfs: S_ISREG(mode) is not mode & S_IFREG...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/btrfs/inode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index e91b097e7252..caa26ab5ed68 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4467,7 +4467,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;
@@ -4512,7 +4512,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) ||