Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / fs / ocfs2 / cluster / tcp_internal.h

diff --git a/fs/ocfs2/cluster/tcp_internal.h b/fs/ocfs2/cluster/tcp_internal.h
index 15fdbdf9eb4b570326f65f5ec834063d1969bc4a..4cbcb65784a358b6e10703b589b724b18a71022d 100644 (file)
--- a/fs/ocfs2/cluster/tcp_internal.h
+++ b/fs/ocfs2/cluster/tcp_internal.h
@@ -166,18 +166,27 @@ struct o2net_sock_container {
        /* original handlers for the sockets */
        void                    (*sc_state_change)(struct sock *sk);
        void                    (*sc_data_ready)(struct sock *sk, int bytes);
-#ifdef CONFIG_DEBUG_FS
-       struct list_head        sc_net_debug_item;
-#endif
-       struct timeval          sc_tv_timer;
-       struct timeval          sc_tv_data_ready;
-       struct timeval          sc_tv_advance_start;
-       struct timeval          sc_tv_advance_stop;
-       struct timeval          sc_tv_func_start;
-       struct timeval          sc_tv_func_stop;
+
        u32                     sc_msg_key;
        u16                     sc_msg_type;
 
+#ifdef CONFIG_DEBUG_FS
+       struct list_head        sc_net_debug_item;
+       ktime_t                 sc_tv_timer;
+       ktime_t                 sc_tv_data_ready;
+       ktime_t                 sc_tv_advance_start;
+       ktime_t                 sc_tv_advance_stop;
+       ktime_t                 sc_tv_func_start;
+       ktime_t                 sc_tv_func_stop;
+#endif
+#ifdef CONFIG_OCFS2_FS_STATS
+       ktime_t                 sc_tv_acquiry_total;
+       ktime_t                 sc_tv_send_total;
+       ktime_t                 sc_tv_status_total;
+       u32                     sc_send_count;
+       u32                     sc_recv_count;
+       ktime_t                 sc_tv_process_total;
+#endif
        struct mutex            sc_send_lock;
 };
 
@@ -220,9 +229,9 @@ struct o2net_send_tracking {
        u32                             st_msg_type;
        u32                             st_msg_key;
        u8                              st_node;
-       struct timeval                  st_sock_time;
-       struct timeval                  st_send_time;
-       struct timeval                  st_status_time;
+       ktime_t                         st_sock_time;
+       ktime_t                         st_send_time;
+       ktime_t                         st_status_time;
 };
 #else
 struct o2net_send_tracking {