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/jbd2 | |
| parent | 87eeff7974ae665f6d4d74c2f97c04d4b180b5d6 (diff) | |
| parent | 92e3b40537707001d17bbad800d150ab04e53bf4 (diff) | |
| download | linux-805937cf45f9a9933e6b8e5c6660406e977a9a23.tar.gz linux-805937cf45f9a9933e6b8e5c6660406e977a9a23.tar.bz2 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/jbd2')
| -rw-r--r-- | fs/jbd2/transaction.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 8360674c85bc..60bb365f54a5 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -514,11 +514,13 @@ int jbd2_journal_start_reserved(handle_t *handle, unsigned int type, * similarly constrained call sites */ ret = start_this_handle(journal, handle, GFP_NOFS); - if (ret < 0) + if (ret < 0) { jbd2_journal_free_reserved(handle); + return ret; + } handle->h_type = type; handle->h_line_no = line_no; - return ret; + return 0; } EXPORT_SYMBOL(jbd2_journal_start_reserved); |