]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
jbd2: clean up an assertion in jbd2_journal_commit_transaction()
authordingdinghua <dingdinghua@nrchpc.ac.cn>
Wed, 24 Feb 2010 17:11:20 +0000 (12:11 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Wed, 24 Feb 2010 17:11:20 +0000 (12:11 -0500)
commit_transaction has the same value as journal->j_running_transaction,
so we can simplify the assert statement.

Signed-off-by: dingdinghua <dingdinghua@nrchpc.ac.cn>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
fs/jbd2/commit.c

index 3ee211ed58f1e6cff0171c88c7c3804ef8c2a73e..671da7fb7ffd528fc9ecb545298603b4daf701f8 100644 (file)
@@ -883,8 +883,7 @@ restart_loop:
                spin_unlock(&journal->j_list_lock);
                bh = jh2bh(jh);
                jbd_lock_bh_state(bh);
-               J_ASSERT_JH(jh, jh->b_transaction == commit_transaction ||
-                       jh->b_transaction == journal->j_running_transaction);
+               J_ASSERT_JH(jh, jh->b_transaction == commit_transaction);
 
                /*
                 * If there is undo-protected committed data against