diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2013-06-12 22:56:35 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2013-06-12 22:56:35 -0400 |
commit | cfc7bc896f45251bdcfa45e0d62fda0566e95c4a (patch) | |
tree | 44d0dc0c3a003a6a72031955dbeb2ea6d56c7456 /fs/jbd2/commit.c | |
parent | 0ef54180e0187117062939202b96faf04c8673bc (diff) |
jbd2: fix duplicate debug label for phase 2
Currently we see this output:
$git grep phase fs/jbd2
fs/jbd2/commit.c: jbd_debug(3, "JBD2: commit phase 1\n");
fs/jbd2/commit.c: jbd_debug(3, "JBD2: commit phase 2\n");
fs/jbd2/commit.c: jbd_debug(3, "JBD2: commit phase 2\n");
fs/jbd2/commit.c: jbd_debug(3, "JBD2: commit phase 3\n");
fs/jbd2/commit.c: jbd_debug(3, "JBD2: commit phase 4\n");
[...]
There is clearly a duplicate label for phase 2, and they are
both active (i.e. not in #if ... #else block). Rename them to
be "2a" and "2b" so the debug output is unambiguous.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/jbd2/commit.c')
-rw-r--r-- | fs/jbd2/commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 44b429126258..559bec1a37b4 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c | |||
@@ -542,7 +542,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) | |||
542 | wake_up(&journal->j_wait_transaction_locked); | 542 | wake_up(&journal->j_wait_transaction_locked); |
543 | write_unlock(&journal->j_state_lock); | 543 | write_unlock(&journal->j_state_lock); |
544 | 544 | ||
545 | jbd_debug(3, "JBD2: commit phase 2\n"); | 545 | jbd_debug(3, "JBD2: commit phase 2a\n"); |
546 | 546 | ||
547 | /* | 547 | /* |
548 | * Now start flushing things to disk, in the order they appear | 548 | * Now start flushing things to disk, in the order they appear |
@@ -557,7 +557,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) | |||
557 | &log_bufs, WRITE_SYNC); | 557 | &log_bufs, WRITE_SYNC); |
558 | blk_finish_plug(&plug); | 558 | blk_finish_plug(&plug); |
559 | 559 | ||
560 | jbd_debug(3, "JBD2: commit phase 2\n"); | 560 | jbd_debug(3, "JBD2: commit phase 2b\n"); |
561 | 561 | ||
562 | /* | 562 | /* |
563 | * Way to go: we have now written out all of the data for a | 563 | * Way to go: we have now written out all of the data for a |