ext4: open-code jbd2 stats union references

Index: linux-2.6.24-rc3/fs/jbd2/commit.c
===================================================================
@@ -339,10 +339,10 @@ void jbd2_journal_commit_transaction(jou
 	spin_lock(&journal->j_state_lock);
 	commit_transaction->t_state = T_LOCKED;
 
-	stats.ts_wait = commit_transaction->t_max_wait;
-	stats.ts_locked = jiffies;
-	stats.ts_running = jbd2_time_diff(commit_transaction->t_start,
-						stats.ts_locked);
+	stats.u.run.rs_wait = commit_transaction->t_max_wait;
+	stats.u.run.rs_locked = jiffies;
+	stats.u.run.rs_running = jbd2_time_diff(commit_transaction->t_start,
+						stats.u.run.rs_locked);
 
 	spin_lock(&commit_transaction->t_handle_lock);
 	while (commit_transaction->t_updates) {

@@ -414,8 +414,9 @@ void jbd2_journal_commit_transaction(jou
 	 */
 	jbd2_journal_switch_revoke_table(journal);
 
-	stats.ts_flushing = jiffies;
-	stats.ts_locked = jbd2_time_diff(stats.ts_locked, stats.ts_flushing);
+	stats.u.run.rs_flushing = jiffies;
+	stats.u.run.rs_locked = jbd2_time_diff(stats.u.run.rs_locked,
+					       stats.u.run.rs_flushing);
 
 	commit_transaction->t_state = T_FLUSH;
 	journal->j_committing_transaction = commit_transaction;

@@ -508,10 +509,11 @@ void jbd2_journal_commit_transaction(jou
 	 */
 	commit_transaction->t_state = T_COMMIT;
 
-	stats.ts_logging = jiffies;
-	stats.ts_flushing = jbd2_time_diff(stats.ts_flushing, stats.ts_logging);
-	stats.ts_blocks = commit_transaction->t_outstanding_credits;
-	stats.ts_blocks_logged = 0;
+	stats.u.run.rs_logging = jiffies;
+	stats.u.run.rs_flushing = jbd2_time_diff(stats.u.run.rs_flushing,
+						 stats.u.run.rs_logging);
+	stats.u.run.rs_blocks = commit_transaction->t_outstanding_credits;
+	stats.u.run.rs_blocks_logged = 0;
 
 	descriptor = NULL;
 	bufs = 0;

@@ -661,7 +663,7 @@ start_journal_io:
 				submit_bh(WRITE, bh);
 			}
 			cond_resched();
-			stats.ts_blocks_logged += bufs;
+			stats.u.run.rs_blocks_logged += bufs;
 
 			/* Force a new descriptor to be generated next
                            time round the loop. */

@@ -908,7 +910,7 @@ restart_loop:
 	J_ASSERT(commit_transaction->t_state == T_COMMIT);
 
 	commit_transaction->t_start = jiffies;
-	stats.ts_logging = jbd2_time_diff(stats.ts_logging,
+	stats.u.run.rs_logging = jbd2_time_diff(stats.u.run.rs_logging,
 						commit_transaction->t_start);
 
 	/*

@@ -916,7 +918,7 @@ restart_loop:
 	 */
 	stats.ts_type = JBD2_STATS_RUN;
 	stats.ts_tid = commit_transaction->t_tid;
-	stats.ts_handle_count = commit_transaction->t_handle_count;
+	stats.u.run.rs_handle_count = commit_transaction->t_handle_count;
 	spin_lock(&journal->j_history_lock);
 	memcpy(journal->j_history + journal->j_history_cur, &stats,
 			sizeof(stats));

@@ -927,14 +929,14 @@ restart_loop:
 	 * Calculate overall stats
 	 */
 	journal->j_stats.ts_tid++;
-	journal->j_stats.ts_wait += stats.ts_wait;
-	journal->j_stats.ts_running += stats.ts_running;
-	journal->j_stats.ts_locked += stats.ts_locked;
-	journal->j_stats.ts_flushing += stats.ts_flushing;
-	journal->j_stats.ts_logging += stats.ts_logging;
-	journal->j_stats.ts_handle_count += stats.ts_handle_count;
-	journal->j_stats.ts_blocks += stats.ts_blocks;
-	journal->j_stats.ts_blocks_logged += stats.ts_blocks_logged;
+	journal->j_stats.u.run.rs_wait += stats.u.run.rs_wait;
+	journal->j_stats.u.run.rs_running += stats.u.run.rs_running;
+	journal->j_stats.u.run.rs_locked += stats.u.run.rs_locked;
+	journal->j_stats.u.run.rs_flushing += stats.u.run.rs_flushing;
+	journal->j_stats.u.run.rs_logging += stats.u.run.rs_logging;
+	journal->j_stats.u.run.rs_handle_count += stats.u.run.rs_handle_count;
+	journal->j_stats.u.run.rs_blocks += stats.u.run.rs_blocks;
+	journal->j_stats.u.run.rs_blocks_logged += stats.u.run.rs_blocks_logged;
 	spin_unlock(&journal->j_history_lock);
 
 	commit_transaction->t_state = T_FINISHED;

65 lines not on this page · raw message

Index: linux-2.6.24-rc3/include/linux/jbd2.h
===================================================================
@@ -612,20 +612,6 @@ struct transaction_stats_s
 #define JBD2_STATS_RUN		1
 #define JBD2_STATS_CHECKPOINT	2
 
-#define ts_wait			u.run.rs_wait
-#define ts_running		u.run.rs_running
-#define ts_locked		u.run.rs_locked
-#define ts_flushing		u.run.rs_flushing
-#define ts_logging		u.run.rs_logging
-#define ts_handle_count		u.run.rs_handle_count
-#define ts_blocks		u.run.rs_blocks
-#define ts_blocks_logged	u.run.rs_blocks_logged
-
-#define ts_chp_time		u.chp.cs_chp_time
-#define ts_forced_to_close	u.chp.cs_forced_to_close
-#define ts_written		u.chp.cs_written
-#define ts_dropped		u.chp.cs_dropped
-
 static inline unsigned long
 jbd2_time_diff(unsigned long start, unsigned long end)
 {