summaryrefslogtreecommitdiffstats
path: root/fs/jbd2/transaction.c
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2012-03-13 22:27:44 -0400
committerTheodore Ts'o <tytso@mit.edu>2012-03-13 22:27:44 -0400
commitc254c9ec14d5c418c8f36ea7573edae2470a1dc1 (patch)
treef7f7fd284408a2c986fbd78093e22c6a8850367f /fs/jbd2/transaction.c
parent5bebccf90127859085f6a020f08ff7f648e285a0 (diff)
downloadlinux-stable-c254c9ec14d5c418c8f36ea7573edae2470a1dc1.tar.gz
linux-stable-c254c9ec14d5c418c8f36ea7573edae2470a1dc1.tar.bz2
linux-stable-c254c9ec14d5c418c8f36ea7573edae2470a1dc1.zip
jbd2: remove always true condition in __journal_try_to_free_buffer()
The check b_jlist == BJ_None in __journal_try_to_free_buffer() is always true (__jbd2_journal_temp_unlink_buffer() also checks this in an assertion) so just remove it. Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/jbd2/transaction.c')
-rw-r--r--fs/jbd2/transaction.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index 3eb326a54bf1..fd052a88e9ec 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -1676,10 +1676,8 @@ __journal_try_to_free_buffer(journal_t *journal, struct buffer_head *bh)
spin_lock(&journal->j_list_lock);
if (jh->b_cp_transaction != NULL && jh->b_transaction == NULL) {
/* written-back checkpointed metadata buffer */
- if (jh->b_jlist == BJ_None) {
- JBUFFER_TRACE(jh, "remove from checkpoint list");
- __jbd2_journal_remove_checkpoint(jh);
- }
+ JBUFFER_TRACE(jh, "remove from checkpoint list");
+ __jbd2_journal_remove_checkpoint(jh);
}
spin_unlock(&journal->j_list_lock);
out: