Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 559cce69 authored by Taesoo Kim's avatar Taesoo Kim Committed by Theodore Ts'o
Browse files

jbd2: fix incorrect unlock on j_list_lock 



When 'jh->b_transaction == transaction' (asserted by below)

  J_ASSERT_JH(jh, (jh->b_transaction == transaction || ...

'journal->j_list_lock' will be incorrectly unlocked, since
the the lock is aquired only at the end of if / else-if
statements (missing the else case).

Signed-off-by: default avatarTaesoo Kim <tsgatesv@gmail.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarAndreas Dilger <adilger@dilger.ca>
Fixes: 6e4862a5
Cc: stable@vger.kernel.org # 3.14+
parent 651e1c3b

fs/jbd2/transaction.c

+2 −1
Original line number Diff line number Diff line
@@ -1149,6 +1149,7 @@ int jbd2_journal_get_create_access(handle_t *handle, struct buffer_head *bh) 
		JBUFFER_TRACE(jh, "file as BJ_Reserved");

		spin_lock(&journal->j_list_lock);

		__jbd2_journal_file_buffer(jh, transaction, BJ_Reserved);

		spin_unlock(&journal->j_list_lock);

	} else if (jh->b_transaction == journal->j_committing_transaction) {

		/* first access by this transaction */

		jh->b_modified = 0;
@@ -1156,8 +1157,8 @@ int jbd2_journal_get_create_access(handle_t *handle, struct buffer_head *bh) 
		JBUFFER_TRACE(jh, "set next transaction");

		spin_lock(&journal->j_list_lock);

		jh->b_next_transaction = transaction;

	}

		spin_unlock(&journal->j_list_lock);

	}

	jbd_unlock_bh_state(bh);



	/*