1 files changed, 77 insertions, 0 deletions

diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index d861ffd49821..685640036e81 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -395,6 +395,16 @@ struct handle_s
 };
 
 
+/*
+ * Some stats for checkpoint phase
+ */
+struct transaction_chp_stats_s {
+        unsigned long           cs_chp_time;
+        unsigned long           cs_forced_to_close;
+        unsigned long           cs_written;
+        unsigned long           cs_dropped;
+};
+
 /* The transaction_t type is the guts of the journaling mechanism.  It
  * tracks a compound transaction through its various states:
  *
@@ -532,6 +542,21 @@ struct transaction_s
         spinlock_t              t_handle_lock;
 
         /*
+         * Longest time some handle had to wait for running transaction
+         */
+        unsigned long           t_max_wait;
+
+        /*
+         * When transaction started
+         */
+        unsigned long           t_start;
+
+        /*
+         * Checkpointing stats [j_checkpoint_sem]
+         */
+        struct transaction_chp_stats_s t_chp_stats;
+
+        /*
          * Number of outstanding updates running on this transaction
          * [t_handle_lock]
          */
@@ -562,6 +587,39 @@ struct transaction_s
 
 };
 
+struct transaction_run_stats_s {
+        unsigned long           rs_wait;
+        unsigned long           rs_running;
+        unsigned long           rs_locked;
+        unsigned long           rs_flushing;
+        unsigned long           rs_logging;
+
+        unsigned long           rs_handle_count;
+        unsigned long           rs_blocks;
+        unsigned long           rs_blocks_logged;
+};
+
+struct transaction_stats_s {
+        int                     ts_type;
+        unsigned long           ts_tid;
+        union {
+                struct transaction_run_stats_s run;
+                struct transaction_chp_stats_s chp;
+        } u;
+};
+
+#define JBD2_STATS_RUN          1
+#define JBD2_STATS_CHECKPOINT   2
+
+static inline unsigned long
+jbd2_time_diff(unsigned long start, unsigned long end)
+{
+        if (end >= start)
+                return end - start;
+
+        return end + (MAX_JIFFY_OFFSET - start);
+}
+
 /**
  * struct journal_s - The journal_s type is the concrete type associated with
  *     journal_t.
@@ -623,6 +681,12 @@ struct transaction_s
  * @j_wbufsize: maximum number of buffer_heads allowed in j_wbuf, the
  *      number that will fit in j_blocksize
  * @j_last_sync_writer: most recent pid which did a synchronous write
+ * @j_history: Buffer storing the transactions statistics history
+ * @j_history_max: Maximum number of transactions in the statistics history
+ * @j_history_cur: Current number of transactions in the statistics history
+ * @j_history_lock: Protect the transactions statistics history
+ * @j_proc_entry: procfs entry for the jbd statistics directory
+ * @j_stats: Overall statistics
  * @j_private: An opaque pointer to fs-private information.
  */
 
@@ -815,6 +879,19 @@ struct journal_s
         pid_t                   j_last_sync_writer;
 
         /*
+         * Journal statistics
+         */
+        struct transaction_stats_s *j_history;
+        int                     j_history_max;
+        int                     j_history_cur;
+        /*
+         * Protect the transactions statistics history
+         */
+        spinlock_t              j_history_lock;
+        struct proc_dir_entry   *j_proc_entry;
+        struct transaction_stats_s j_stats;
+
+        /*
          * An opaque pointer to fs-private information.  ext3 puts its
          * superblock pointer here
          */