diff options
| author | Eric Whitney <enwlinux@gmail.com> | 2014-01-06 14:00:23 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2014-01-06 14:00:23 -0500 |
| commit | d0abafac8c9162f39c4f6b2f8141b772a09b3770 (patch) | |
| tree | 9f352c64a8d2cb8330600c11e8dc9855af9c63be /fs | |
| parent | f5a44db5d2d677dfbf12deee461f85e9ec633961 (diff) | |
ext4: fix bigalloc regression
Commit f5a44db5d2 introduced a regression on filesystems created with
the bigalloc feature (cluster size > blocksize). It causes xfstests
generic/006 and /013 to fail with an unexpected JBD2 failure and
transaction abort that leaves the test file system in a read only state.
Other xfstests run on bigalloc file systems are likely to fail as well.
The cause is the accidental use of a cluster mask where a cluster
offset was needed in ext4_ext_map_blocks().
Signed-off-by: Eric Whitney <enwlinux@gmail.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/extents.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 4410cc3d6ee2..3384dc4bed40 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c | |||
| @@ -4218,7 +4218,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, | |||
| 4218 | */ | 4218 | */ |
| 4219 | map->m_flags &= ~EXT4_MAP_FROM_CLUSTER; | 4219 | map->m_flags &= ~EXT4_MAP_FROM_CLUSTER; |
| 4220 | newex.ee_block = cpu_to_le32(map->m_lblk); | 4220 | newex.ee_block = cpu_to_le32(map->m_lblk); |
| 4221 | cluster_offset = EXT4_LBLK_CMASK(sbi, map->m_lblk); | 4221 | cluster_offset = EXT4_LBLK_COFF(sbi, map->m_lblk); |
| 4222 | 4222 | ||
| 4223 | /* | 4223 | /* |
| 4224 | * If we are doing bigalloc, check to see if the extent returned | 4224 | * If we are doing bigalloc, check to see if the extent returned |