jbd2: simplify error path on allocation failure in do_get_write_access()
authorJan Kara <jack@suse.cz>
Mon, 8 Jun 2015 16:40:39 +0000 (12:40 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 8 Jun 2015 16:40:39 +0000 (12:40 -0400)
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>
fs/jbd2/transaction.c

index 2bcb43d770a083209812307e18ba5512d277126a..3b2e617baab6c40a689156dc8740d035e4edbcda 100644 (file)
@@ -947,8 +947,7 @@ repeat:
                                               __func__);
                                        JBUFFER_TRACE(jh, "oom!");
                                        error = -ENOMEM;
-                                       jbd_lock_bh_state(bh);
-                                       goto done;
+                                       goto out;
                                }
                                goto repeat;
                        }