projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm' (patches from Andrew)
[cascardo/linux.git]
/
fs
/
ext4
/
ialloc.c
diff --git
a/fs/ext4/ialloc.c
b/fs/ext4/ialloc.c
index
9e66cd1
..
170421e
100644
(file)
--- a/
fs/ext4/ialloc.c
+++ b/
fs/ext4/ialloc.c
@@
-802,7
+802,7
@@
struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir,
} else
inode_init_owner(inode, dir, mode);
- if (
EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_PROJECT
) &&
+ if (
ext4_has_feature_project(sb
) &&
ext4_test_inode_flag(dir, EXT4_INODE_PROJINHERIT))
ei->i_projid = EXT4_I(dir)->i_projid;
else