diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-18 10:04:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-18 10:04:09 -0800 |
| commit | 805937cf45f9a9933e6b8e5c6660406e977a9a23 (patch) | |
| tree | f7b6365b768a2a5f40ccdaf8625b2c4188eef2ce /fs/ext4/extents.c | |
| parent | 87eeff7974ae665f6d4d74c2f97c04d4b180b5d6 (diff) | |
| parent | 92e3b40537707001d17bbad800d150ab04e53bf4 (diff) | |
| download | talos-op-linux-805937cf45f9a9933e6b8e5c6660406e977a9a23.tar.gz talos-op-linux-805937cf45f9a9933e6b8e5c6660406e977a9a23.zip | |
Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 fixes from Ted Ts'o:
"Miscellaneous ext4 bug fixes for v3.14"
* tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
jbd2: fix use after free in jbd2_journal_start_reserved()
ext4: don't leave i_crtime.tv_sec uninitialized
ext4: fix online resize with a non-standard blocks per group setting
ext4: fix online resize with very large inode tables
ext4: don't try to modify s_flags if the the file system is read-only
ext4: fix error paths in swap_inode_boot_loader()
ext4: fix xfstest generic/299 block validity failures
Diffstat (limited to 'fs/ext4/extents.c')
| -rw-r--r-- | fs/ext4/extents.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 10cff4736b11..74bc2d549c58 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -3906,6 +3906,7 @@ ext4_ext_handle_uninitialized_extents(handle_t *handle, struct inode *inode, } else err = ret; map->m_flags |= EXT4_MAP_MAPPED; + map->m_pblk = newblock; if (allocated > map->m_len) allocated = map->m_len; map->m_len = allocated; |
