From: Jan Kara <jack@suse.cz>
Date: Mon, 8 Jun 2015 16:40:39 +0000 (-0400)
Subject: jbd2: simplify error path on allocation failure in do_get_write_access()
X-Git-Tag: v4.2-rc1~118^2~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d012aa5965160a39b24a4b41139a322f681cdfd7;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index 2bcb43d770a08..3b2e617baab6c 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;
 			}