summaryrefslogtreecommitdiffstats
path: root/fs/jbd2
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2015-06-08 12:40:39 -0400
committerTheodore Ts'o <tytso@mit.edu>2015-06-08 12:40:39 -0400
commitd012aa5965160a39b24a4b41139a322f681cdfd7 (patch)
tree0dddca2dd998788c9fe4487654338bb4f5a13e6d /fs/jbd2
parentee57aba159a5c329dc78c181a3ae0549e59f0925 (diff)
downloadlinux-d012aa5965160a39b24a4b41139a322f681cdfd7.tar.bz2
jbd2: simplify error path on allocation failure in do_get_write_access()
We were acquiring bh_state_lock when allocation of buffer failed in do_get_write_access() only to be able to jump to a label that releases the lock and does all other checks that don't make sense for this error path. Just jump into the right label instead. Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/jbd2')
-rw-r--r--fs/jbd2/transaction.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index 2bcb43d770a0..3b2e617baab6 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -947,8 +947,7 @@ repeat:
__func__);
JBUFFER_TRACE(jh, "oom!");
error = -ENOMEM;
- jbd_lock_bh_state(bh);
- goto done;
+ goto out;
}
goto repeat;
}