From d012aa5965160a39b24a4b41139a322f681cdfd7 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 8 Jun 2015 12:40:39 -0400 Subject: [PATCH] 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 Signed-off-by: Theodore Ts'o --- fs/jbd2/transaction.c | 3 +-- 1 file changed, 1 insertion(+), 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; } -- 2.20.1