diff options
| author |   James Morris <james.l.morris@oracle.com> | 2015-11-23 22:46:28 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-11-23 22:46:28 +1100 |
| commit | ebd68df3f24b318d391d15c458d6f43f340ba36a (patch) | |
| tree | f0277bc4b853abe5db1d30fa4e10b05bba7f2ac5 /fs/ext4/indirect.c | |
| parent | security/capability.h: cap_issubset/isclear can be boolean (diff) | |
| parent | Linux 4.4-rc2 (diff) | |
| download | linux-dev-ebd68df3f24b318d391d15c458d6f43f340ba36a.tar.xz linux-dev-ebd68df3f24b318d391d15c458d6f43f340ba36a.zip | |
Sync to Linus v4.4-rc2 for LSM developers.
Diffstat (limited to 'fs/ext4/indirect.c')
| -rw-r--r-- | fs/ext4/indirect.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c index 2468261748b2..355ef9c36c87 100644 --- a/fs/ext4/indirect.c +++ b/fs/ext4/indirect.c @@ -562,11 +562,10 @@ int ext4_ind_map_blocks(handle_t *handle, struct inode *inode, /* * Okay, we need to do block allocation. */ - if (EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb, - EXT4_FEATURE_RO_COMPAT_BIGALLOC)) { + if (ext4_has_feature_bigalloc(inode->i_sb)) { EXT4_ERROR_INODE(inode, "Can't allocate blocks for " "non-extent mapped inodes with bigalloc"); - return -EUCLEAN; + return -EFSCORRUPTED; } /* Set up for the direct block allocation */ |