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

Commit cdd04d98 authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

[DCCP]: Convert do_gettimeofday() to getnstimeofday(). 



What do_gettimeofday() does is to call getnstimeofday() and
to convert the result from timespec{} to timeval{}.
We do not always need timeval{} and we can convert timespec{}
when we really need (to print).

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Acked-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 633d424b

net/dccp/probe.c

+6 −11
Original line number Diff line number Diff line
@@ -46,29 +46,24 @@ struct { 
	struct kfifo	  *fifo;

	spinlock_t	  lock;

	wait_queue_head_t wait;

	struct timeval	  tstart;

	struct timespec	  tstart;

} dccpw;



static void printl(const char *fmt, ...)

{

	va_list args;

	int len;

	struct timeval now;

	struct timespec now;

	char tbuf[256];



	va_start(args, fmt);

	do_gettimeofday(&now);

	getnstimeofday(&now);



	now.tv_sec -= dccpw.tstart.tv_sec;

	now.tv_usec -= dccpw.tstart.tv_usec;

	if (now.tv_usec < 0) {

		--now.tv_sec;

		now.tv_usec += 1000000;

	}

	now = timespec_sub(now, dccpw.tstart);



	len = sprintf(tbuf, "%lu.%06lu ",

		      (unsigned long) now.tv_sec,

		      (unsigned long) now.tv_usec);

		      (unsigned long) now.tv_nsec / NSEC_PER_USEC);

	len += vscnprintf(tbuf+len, sizeof(tbuf)-len, fmt, args);

	va_end(args);
@@ -119,7 +114,7 @@ static struct jprobe dccp_send_probe = { 
static int dccpprobe_open(struct inode *inode, struct file *file)

{

	kfifo_reset(dccpw.fifo);

	do_gettimeofday(&dccpw.tstart);

	getnstimeofday(&dccpw.tstart);

	return 0;

}