diff --git a/[refs] b/[refs] index e7bf4898da9d..08d4ecc32fa0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d6f4e60e736a00b50ec668ba1a9fe27afb083a3 +refs/heads/master: f63dcda197bd71c6565c2121bf70e3d371539f90 diff --git a/trunk/fs/jbd/transaction.c b/trunk/fs/jbd/transaction.c index 08ff6c7028cc..038ed7436199 100644 --- a/trunk/fs/jbd/transaction.c +++ b/trunk/fs/jbd/transaction.c @@ -288,10 +288,12 @@ handle_t *journal_start(journal_t *journal, int nblocks) jbd_free_handle(handle); current->journal_info = NULL; handle = ERR_PTR(err); + goto out; } lock_acquire(&handle->h_lockdep_map, 0, 0, 0, 2, _THIS_IP_); +out: return handle; }