diff options
author | Sunil Mushran <sunil.mushran@oracle.com> | 2010-12-22 15:39:38 -0500 |
---|---|---|
committer | Joel Becker <joel.becker@oracle.com> | 2010-12-22 21:34:49 -0500 |
commit | 3f9c14fab0a2e90af9995f261a123f59e0b41141 (patch) | |
tree | 69a2a6a07d4c2144c06acd81cd2ff32b62879253 /fs/ocfs2/cluster/netdebug.c | |
parent | 8757241e32a295a2aa836e8f8b32912204d11fda (diff) |
ocfs2/cluster: Replace timeval with ktime in struct o2net_send_tracking
Replace time trackers in struct o2net_send_tracking from struct timeval to
union ktime.
Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2/cluster/netdebug.c')
-rw-r--r-- | fs/ocfs2/cluster/netdebug.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/fs/ocfs2/cluster/netdebug.c b/fs/ocfs2/cluster/netdebug.c index 0edf836b42d5..2b986aa82299 100644 --- a/fs/ocfs2/cluster/netdebug.c +++ b/fs/ocfs2/cluster/netdebug.c | |||
@@ -123,10 +123,17 @@ static void *nst_seq_next(struct seq_file *seq, void *v, loff_t *pos) | |||
123 | static int nst_seq_show(struct seq_file *seq, void *v) | 123 | static int nst_seq_show(struct seq_file *seq, void *v) |
124 | { | 124 | { |
125 | struct o2net_send_tracking *nst, *dummy_nst = seq->private; | 125 | struct o2net_send_tracking *nst, *dummy_nst = seq->private; |
126 | ktime_t now; | ||
127 | s64 sock, send, status; | ||
126 | 128 | ||
127 | spin_lock(&o2net_debug_lock); | 129 | spin_lock(&o2net_debug_lock); |
128 | nst = next_nst(dummy_nst); | 130 | nst = next_nst(dummy_nst); |
129 | 131 | ||
132 | now = ktime_get(); | ||
133 | sock = ktime_to_us(ktime_sub(now, nst->st_sock_time)); | ||
134 | send = ktime_to_us(ktime_sub(now, nst->st_send_time)); | ||
135 | status = ktime_to_us(ktime_sub(now, nst->st_status_time)); | ||
136 | |||
130 | if (nst != NULL) { | 137 | if (nst != NULL) { |
131 | /* get_task_comm isn't exported. oh well. */ | 138 | /* get_task_comm isn't exported. oh well. */ |
132 | seq_printf(seq, "%p:\n" | 139 | seq_printf(seq, "%p:\n" |
@@ -138,20 +145,17 @@ static int nst_seq_show(struct seq_file *seq, void *v) | |||
138 | " message id: %d\n" | 145 | " message id: %d\n" |
139 | " message type: %u\n" | 146 | " message type: %u\n" |
140 | " message key: 0x%08x\n" | 147 | " message key: 0x%08x\n" |
141 | " sock acquiry: %lu.%ld\n" | 148 | " sock acquiry: %lld usecs ago\n" |
142 | " send start: %lu.%ld\n" | 149 | " send start: %lld usecs ago\n" |
143 | " wait start: %lu.%ld\n", | 150 | " wait start: %lld usecs ago\n", |
144 | nst, (unsigned long)task_pid_nr(nst->st_task), | 151 | nst, (unsigned long)task_pid_nr(nst->st_task), |
145 | (unsigned long)nst->st_task->tgid, | 152 | (unsigned long)nst->st_task->tgid, |
146 | nst->st_task->comm, nst->st_node, | 153 | nst->st_task->comm, nst->st_node, |
147 | nst->st_sc, nst->st_id, nst->st_msg_type, | 154 | nst->st_sc, nst->st_id, nst->st_msg_type, |
148 | nst->st_msg_key, | 155 | nst->st_msg_key, |
149 | nst->st_sock_time.tv_sec, | 156 | (long long)sock, |
150 | (long)nst->st_sock_time.tv_usec, | 157 | (long long)send, |
151 | nst->st_send_time.tv_sec, | 158 | (long long)status); |
152 | (long)nst->st_send_time.tv_usec, | ||
153 | nst->st_status_time.tv_sec, | ||
154 | (long)nst->st_status_time.tv_usec); | ||
155 | } | 159 | } |
156 | 160 | ||
157 | spin_unlock(&o2net_debug_lock); | 161 | spin_unlock(&o2net_debug_lock); |