diff options
Diffstat (limited to 'fs/jbd2/commit.c')
| -rw-r--r-- | fs/jbd2/commit.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 765b31da4029..af36252b5b2d 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c | |||
| @@ -1083,24 +1083,7 @@ restart_loop: | |||
| 1083 | atomic_read(&commit_transaction->t_handle_count); | 1083 | atomic_read(&commit_transaction->t_handle_count); |
| 1084 | trace_jbd2_run_stats(journal->j_fs_dev->bd_dev, | 1084 | trace_jbd2_run_stats(journal->j_fs_dev->bd_dev, |
| 1085 | commit_transaction->t_tid, &stats.run); | 1085 | commit_transaction->t_tid, &stats.run); |
| 1086 | 1086 | stats.ts_requested = (commit_transaction->t_requested) ? 1 : 0; | |
| 1087 | /* | ||
| 1088 | * Calculate overall stats | ||
| 1089 | */ | ||
| 1090 | spin_lock(&journal->j_history_lock); | ||
| 1091 | journal->j_stats.ts_tid++; | ||
| 1092 | if (commit_transaction->t_requested) | ||
| 1093 | journal->j_stats.ts_requested++; | ||
| 1094 | journal->j_stats.run.rs_wait += stats.run.rs_wait; | ||
| 1095 | journal->j_stats.run.rs_request_delay += stats.run.rs_request_delay; | ||
| 1096 | journal->j_stats.run.rs_running += stats.run.rs_running; | ||
| 1097 | journal->j_stats.run.rs_locked += stats.run.rs_locked; | ||
| 1098 | journal->j_stats.run.rs_flushing += stats.run.rs_flushing; | ||
| 1099 | journal->j_stats.run.rs_logging += stats.run.rs_logging; | ||
| 1100 | journal->j_stats.run.rs_handle_count += stats.run.rs_handle_count; | ||
| 1101 | journal->j_stats.run.rs_blocks += stats.run.rs_blocks; | ||
| 1102 | journal->j_stats.run.rs_blocks_logged += stats.run.rs_blocks_logged; | ||
| 1103 | spin_unlock(&journal->j_history_lock); | ||
| 1104 | 1087 | ||
| 1105 | commit_transaction->t_state = T_COMMIT_CALLBACK; | 1088 | commit_transaction->t_state = T_COMMIT_CALLBACK; |
| 1106 | J_ASSERT(commit_transaction == journal->j_committing_transaction); | 1089 | J_ASSERT(commit_transaction == journal->j_committing_transaction); |
| @@ -1157,4 +1140,21 @@ restart_loop: | |||
| 1157 | spin_unlock(&journal->j_list_lock); | 1140 | spin_unlock(&journal->j_list_lock); |
| 1158 | write_unlock(&journal->j_state_lock); | 1141 | write_unlock(&journal->j_state_lock); |
| 1159 | wake_up(&journal->j_wait_done_commit); | 1142 | wake_up(&journal->j_wait_done_commit); |
| 1143 | |||
| 1144 | /* | ||
| 1145 | * Calculate overall stats | ||
| 1146 | */ | ||
| 1147 | spin_lock(&journal->j_history_lock); | ||
| 1148 | journal->j_stats.ts_tid++; | ||
| 1149 | journal->j_stats.ts_requested += stats.ts_requested; | ||
| 1150 | journal->j_stats.run.rs_wait += stats.run.rs_wait; | ||
| 1151 | journal->j_stats.run.rs_request_delay += stats.run.rs_request_delay; | ||
| 1152 | journal->j_stats.run.rs_running += stats.run.rs_running; | ||
| 1153 | journal->j_stats.run.rs_locked += stats.run.rs_locked; | ||
| 1154 | journal->j_stats.run.rs_flushing += stats.run.rs_flushing; | ||
| 1155 | journal->j_stats.run.rs_logging += stats.run.rs_logging; | ||
| 1156 | journal->j_stats.run.rs_handle_count += stats.run.rs_handle_count; | ||
| 1157 | journal->j_stats.run.rs_blocks += stats.run.rs_blocks; | ||
| 1158 | journal->j_stats.run.rs_blocks_logged += stats.run.rs_blocks_logged; | ||
| 1159 | spin_unlock(&journal->j_history_lock); | ||
| 1160 | } | 1160 | } |