diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-02 19:33:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-02 19:33:21 -0800 |
| commit | a7c1120d2dcc83691bafa034d98f70285757e826 (patch) | |
| tree | 56779f292c2dea78feff290c3ce26724d33b3f3e /fs/jbd2/transaction.c | |
| parent | 6ec40b423032ca769c96fbf9a080db822821893d (diff) | |
| parent | 9b2ff35753c0512bc8c6adae9e9c87cbeee86f82 (diff) | |
| download | op-kernel-dev-a7c1120d2dcc83691bafa034d98f70285757e826.zip op-kernel-dev-a7c1120d2dcc83691bafa034d98f70285757e826.tar.gz | |
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 bug fixes from Ted Ts'o:
"Various bug fixes for ext4. The most important is a fix for the new
extent cache's slab shrinker which can cause significant, user-visible
pauses when the system is under memory pressure."
* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: enable quotas before orphan cleanup
ext4: don't allow quota mount options when quota feature enabled
ext4: fix a warning from sparse check for ext4_dir_llseek
ext4: convert number of blocks to clusters properly
ext4: fix possible memory leak in ext4_remount()
jbd2: fix ERR_PTR dereference in jbd2__journal_start
ext4: use percpu counter for extent cache count
ext4: optimize ext4_es_shrink()
Diffstat (limited to 'fs/jbd2/transaction.c')
| -rw-r--r-- | fs/jbd2/transaction.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index b7e2385..d6ee5ae 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -382,7 +382,7 @@ handle_t *jbd2__journal_start(journal_t *journal, int nblocks, gfp_t gfp_mask, if (err < 0) { jbd2_free_handle(handle); current->journal_info = NULL; - handle = ERR_PTR(err); + return ERR_PTR(err); } handle->h_type = type; handle->h_line_no = line_no; |
