diff options
Diffstat (limited to 'fs/jbd')
-rw-r--r-- | fs/jbd/checkpoint.c | 2 | ||||
-rw-r--r-- | fs/jbd/journal.c | 2 | ||||
-rw-r--r-- | fs/jbd/recovery.c | 2 | ||||
-rw-r--r-- | fs/jbd/transaction.c | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c index 961ada28db5e..0208cc7ac5d0 100644 --- a/fs/jbd/checkpoint.c +++ b/fs/jbd/checkpoint.c | |||
@@ -480,7 +480,7 @@ static int journal_clean_one_cp_list(struct journal_head *jh, int *released) | |||
480 | if (!jh) | 480 | if (!jh) |
481 | return 0; | 481 | return 0; |
482 | 482 | ||
483 | last_jh = jh->b_cpprev; | 483 | last_jh = jh->b_cpprev; |
484 | do { | 484 | do { |
485 | jh = next_jh; | 485 | jh = next_jh; |
486 | next_jh = jh->b_cpnext; | 486 | next_jh = jh->b_cpnext; |
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index 88d970e09ce6..b571209d6a1e 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c | |||
@@ -181,7 +181,7 @@ loop: | |||
181 | transaction->t_expires)) | 181 | transaction->t_expires)) |
182 | should_sleep = 0; | 182 | should_sleep = 0; |
183 | if (journal->j_flags & JFS_UNMOUNT) | 183 | if (journal->j_flags & JFS_UNMOUNT) |
184 | should_sleep = 0; | 184 | should_sleep = 0; |
185 | if (should_sleep) { | 185 | if (should_sleep) { |
186 | spin_unlock(&journal->j_state_lock); | 186 | spin_unlock(&journal->j_state_lock); |
187 | schedule(); | 187 | schedule(); |
diff --git a/fs/jbd/recovery.c b/fs/jbd/recovery.c index 73bb64806ed3..445eed6ce5dc 100644 --- a/fs/jbd/recovery.c +++ b/fs/jbd/recovery.c | |||
@@ -314,7 +314,7 @@ static int do_one_pass(journal_t *journal, | |||
314 | unsigned long next_log_block; | 314 | unsigned long next_log_block; |
315 | int err, success = 0; | 315 | int err, success = 0; |
316 | journal_superblock_t * sb; | 316 | journal_superblock_t * sb; |
317 | journal_header_t * tmp; | 317 | journal_header_t * tmp; |
318 | struct buffer_head * bh; | 318 | struct buffer_head * bh; |
319 | unsigned int sequence; | 319 | unsigned int sequence; |
320 | int blocktype; | 320 | int blocktype; |
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index bf7fd7117817..e1b3c8af4d17 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c | |||
@@ -580,7 +580,7 @@ repeat: | |||
580 | */ | 580 | */ |
581 | JBUFFER_TRACE(jh, "Unexpected dirty buffer"); | 581 | JBUFFER_TRACE(jh, "Unexpected dirty buffer"); |
582 | jbd_unexpected_dirty_buffer(jh); | 582 | jbd_unexpected_dirty_buffer(jh); |
583 | } | 583 | } |
584 | 584 | ||
585 | unlock_buffer(bh); | 585 | unlock_buffer(bh); |
586 | 586 | ||
@@ -1373,7 +1373,7 @@ int journal_stop(handle_t *handle) | |||
1373 | if (handle->h_sync || | 1373 | if (handle->h_sync || |
1374 | transaction->t_outstanding_credits > | 1374 | transaction->t_outstanding_credits > |
1375 | journal->j_max_transaction_buffers || | 1375 | journal->j_max_transaction_buffers || |
1376 | time_after_eq(jiffies, transaction->t_expires)) { | 1376 | time_after_eq(jiffies, transaction->t_expires)) { |
1377 | /* Do this even for aborted journals: an abort still | 1377 | /* Do this even for aborted journals: an abort still |
1378 | * completes the commit thread, it just doesn't write | 1378 | * completes the commit thread, it just doesn't write |
1379 | * anything to disk. */ | 1379 | * anything to disk. */ |
@@ -1908,7 +1908,7 @@ void journal_invalidatepage(journal_t *journal, | |||
1908 | next = bh->b_this_page; | 1908 | next = bh->b_this_page; |
1909 | 1909 | ||
1910 | if (offset <= curr_off) { | 1910 | if (offset <= curr_off) { |
1911 | /* This block is wholly outside the truncation point */ | 1911 | /* This block is wholly outside the truncation point */ |
1912 | lock_buffer(bh); | 1912 | lock_buffer(bh); |
1913 | may_free &= journal_unmap_buffer(journal, bh); | 1913 | may_free &= journal_unmap_buffer(journal, bh); |
1914 | unlock_buffer(bh); | 1914 | unlock_buffer(bh); |