summaryrefslogtreecommitdiffstats
path: root/fs/jbd2
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2014-03-09 00:07:19 -0500
committerTheodore Ts'o <tytso@mit.edu>2014-03-09 00:07:19 -0500
commitd2eb0b998990abf51d6e1d3bf16a2637b920a660 (patch)
tree9493b41df7e513716f41fc10105b02193dcb5d9e /fs/jbd2
parentd4e839d4a9dc31d0c229e616146b01e1ace56604 (diff)
downloadop-kernel-dev-d2eb0b998990abf51d6e1d3bf16a2637b920a660.zip
op-kernel-dev-d2eb0b998990abf51d6e1d3bf16a2637b920a660.tar.gz
jbd2: check jh->b_transaction without taking j_list_lock
jh->b_transaction is adequately protected for reading by the jbd_lock_bh_state(bh), so we don't need to take j_list_lock in __journal_try_to_free_buffer(). Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/jbd2')
-rw-r--r--fs/jbd2/transaction.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index 60bb365..78900a1 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -1821,11 +1821,11 @@ __journal_try_to_free_buffer(journal_t *journal, struct buffer_head *bh)
if (buffer_locked(bh) || buffer_dirty(bh))
goto out;
- if (jh->b_next_transaction != NULL)
+ if (jh->b_next_transaction != NULL || jh->b_transaction != NULL)
goto out;
spin_lock(&journal->j_list_lock);
- if (jh->b_cp_transaction != NULL && jh->b_transaction == NULL) {
+ if (jh->b_cp_transaction != NULL) {
/* written-back checkpointed metadata buffer */
JBUFFER_TRACE(jh, "remove from checkpoint list");
__jbd2_journal_remove_checkpoint(jh);
OpenPOWER on IntegriCloud