diff options
Diffstat (limited to 'fs/jbd/transaction.c')
-rw-r--r-- | fs/jbd/transaction.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index 0282deb8ff2d..9841b1e5af03 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c | |||
@@ -1172,7 +1172,7 @@ int journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) | |||
1172 | } | 1172 | } |
1173 | 1173 | ||
1174 | /* That test should have eliminated the following case: */ | 1174 | /* That test should have eliminated the following case: */ |
1175 | J_ASSERT_JH(jh, jh->b_frozen_data == 0); | 1175 | J_ASSERT_JH(jh, jh->b_frozen_data == NULL); |
1176 | 1176 | ||
1177 | JBUFFER_TRACE(jh, "file as BJ_Metadata"); | 1177 | JBUFFER_TRACE(jh, "file as BJ_Metadata"); |
1178 | spin_lock(&journal->j_list_lock); | 1178 | spin_lock(&journal->j_list_lock); |
@@ -1522,7 +1522,7 @@ static void __journal_temp_unlink_buffer(struct journal_head *jh) | |||
1522 | 1522 | ||
1523 | J_ASSERT_JH(jh, jh->b_jlist < BJ_Types); | 1523 | J_ASSERT_JH(jh, jh->b_jlist < BJ_Types); |
1524 | if (jh->b_jlist != BJ_None) | 1524 | if (jh->b_jlist != BJ_None) |
1525 | J_ASSERT_JH(jh, transaction != 0); | 1525 | J_ASSERT_JH(jh, transaction != NULL); |
1526 | 1526 | ||
1527 | switch (jh->b_jlist) { | 1527 | switch (jh->b_jlist) { |
1528 | case BJ_None: | 1528 | case BJ_None: |
@@ -1591,11 +1591,11 @@ __journal_try_to_free_buffer(journal_t *journal, struct buffer_head *bh) | |||
1591 | if (buffer_locked(bh) || buffer_dirty(bh)) | 1591 | if (buffer_locked(bh) || buffer_dirty(bh)) |
1592 | goto out; | 1592 | goto out; |
1593 | 1593 | ||
1594 | if (jh->b_next_transaction != 0) | 1594 | if (jh->b_next_transaction != NULL) |
1595 | goto out; | 1595 | goto out; |
1596 | 1596 | ||
1597 | spin_lock(&journal->j_list_lock); | 1597 | spin_lock(&journal->j_list_lock); |
1598 | if (jh->b_transaction != 0 && jh->b_cp_transaction == 0) { | 1598 | if (jh->b_transaction != NULL && jh->b_cp_transaction == NULL) { |
1599 | if (jh->b_jlist == BJ_SyncData || jh->b_jlist == BJ_Locked) { | 1599 | if (jh->b_jlist == BJ_SyncData || jh->b_jlist == BJ_Locked) { |
1600 | /* A written-back ordered data buffer */ | 1600 | /* A written-back ordered data buffer */ |
1601 | JBUFFER_TRACE(jh, "release data"); | 1601 | JBUFFER_TRACE(jh, "release data"); |
@@ -1603,7 +1603,7 @@ __journal_try_to_free_buffer(journal_t *journal, struct buffer_head *bh) | |||
1603 | journal_remove_journal_head(bh); | 1603 | journal_remove_journal_head(bh); |
1604 | __brelse(bh); | 1604 | __brelse(bh); |
1605 | } | 1605 | } |
1606 | } else if (jh->b_cp_transaction != 0 && jh->b_transaction == 0) { | 1606 | } else if (jh->b_cp_transaction != NULL && jh->b_transaction == NULL) { |
1607 | /* written-back checkpointed metadata buffer */ | 1607 | /* written-back checkpointed metadata buffer */ |
1608 | if (jh->b_jlist == BJ_None) { | 1608 | if (jh->b_jlist == BJ_None) { |
1609 | JBUFFER_TRACE(jh, "remove from checkpoint list"); | 1609 | JBUFFER_TRACE(jh, "remove from checkpoint list"); |
@@ -1963,7 +1963,7 @@ void __journal_file_buffer(struct journal_head *jh, | |||
1963 | 1963 | ||
1964 | J_ASSERT_JH(jh, jh->b_jlist < BJ_Types); | 1964 | J_ASSERT_JH(jh, jh->b_jlist < BJ_Types); |
1965 | J_ASSERT_JH(jh, jh->b_transaction == transaction || | 1965 | J_ASSERT_JH(jh, jh->b_transaction == transaction || |
1966 | jh->b_transaction == 0); | 1966 | jh->b_transaction == NULL); |
1967 | 1967 | ||
1968 | if (jh->b_transaction && jh->b_jlist == jlist) | 1968 | if (jh->b_transaction && jh->b_jlist == jlist) |
1969 | return; | 1969 | return; |