Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f9c14fa authored by Sunil Mushran's avatar Sunil Mushran Committed by Joel Becker
Browse files

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: default avatarSunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent 8757241e

fs/ocfs2/cluster/netdebug.c

+13 −9
Original line number Diff line number Diff line
@@ -123,10 +123,17 @@ static void *nst_seq_next(struct seq_file *seq, void *v, loff_t *pos) 
static int nst_seq_show(struct seq_file *seq, void *v)

{

	struct o2net_send_tracking *nst, *dummy_nst = seq->private;

	ktime_t now;

	s64 sock, send, status;



	spin_lock(&o2net_debug_lock);

	nst = next_nst(dummy_nst);



	now = ktime_get();

	sock = ktime_to_us(ktime_sub(now, nst->st_sock_time));

	send = ktime_to_us(ktime_sub(now, nst->st_send_time));

	status = ktime_to_us(ktime_sub(now, nst->st_status_time));



	if (nst != NULL) {

		/* get_task_comm isn't exported.  oh well. */

		seq_printf(seq, "%p:\n"
@@ -138,20 +145,17 @@ static int nst_seq_show(struct seq_file *seq, void *v) 
			   "  message id:   %d\n"

			   "  message type: %u\n"

			   "  message key:  0x%08x\n"

			   "  sock acquiry: %lu.%ld\n"

			   "  send start:   %lu.%ld\n"

			   "  wait start:   %lu.%ld\n",

			   "  sock acquiry: %lld usecs ago\n"

			   "  send start:   %lld usecs ago\n"

			   "  wait start:   %lld usecs ago\n",

			   nst, (unsigned long)task_pid_nr(nst->st_task),

			   (unsigned long)nst->st_task->tgid,

			   nst->st_task->comm, nst->st_node,

			   nst->st_sc, nst->st_id, nst->st_msg_type,

			   nst->st_msg_key,

			   nst->st_sock_time.tv_sec,

			   (long)nst->st_sock_time.tv_usec,

			   nst->st_send_time.tv_sec,

			   (long)nst->st_send_time.tv_usec,

			   nst->st_status_time.tv_sec,

			   (long)nst->st_status_time.tv_usec);

			   (long long)sock,

			   (long long)send,

			   (long long)status);

	}



	spin_unlock(&o2net_debug_lock);

fs/ocfs2/cluster/tcp.c

+3 −3
Original line number Diff line number Diff line
@@ -155,17 +155,17 @@ static void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype, 


static void o2net_set_nst_sock_time(struct o2net_send_tracking *nst)

{

	do_gettimeofday(&nst->st_sock_time);

	nst->st_sock_time = ktime_get();

}



static void o2net_set_nst_send_time(struct o2net_send_tracking *nst)

{

	do_gettimeofday(&nst->st_send_time);

	nst->st_send_time = ktime_get();

}



static void o2net_set_nst_status_time(struct o2net_send_tracking *nst)

{

	do_gettimeofday(&nst->st_status_time);

	nst->st_status_time = ktime_get();

}



static void o2net_set_nst_sock_container(struct o2net_send_tracking *nst,

fs/ocfs2/cluster/tcp_internal.h

+3 −3
Original line number Diff line number Diff line
@@ -220,9 +220,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 {