From: Björn Jacke <bj@sernet.de>
Date: Fri, 17 Sep 2010 11:47:05 +0000 (+0200)
Subject: s3: fix order of arguments in nsec_time_diff call
X-Git-Tag: release-4-0-0alpha14~3213
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=10eefd85c988503309021316f744ebb25579b873;p=ddiss%2Fsamba.git

s3: fix order of arguments in nsec_time_diff call
---

diff --git a/source3/client/client.c b/source3/client/client.c
index cb9ba24e161..86d64f6afa5 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -1119,7 +1119,7 @@ static int do_get(const char *rname, const char *lname_in, bool reget)
 		int this_time;
 
 		clock_gettime_mono(&tp_end);
-		this_time = nsec_time_diff(&tp_start,&tp_end)/1000000;
+		this_time = nsec_time_diff(&tp_end,&tp_start)/1000000;
 		get_total_time_ms += this_time;
 		get_total_size += nread;
 
@@ -1768,7 +1768,7 @@ static int do_put(const char *rname, const char *lname, bool reput)
 		int this_time;
 
 		clock_gettime_mono(&tp_end);
-		this_time = nsec_time_diff(&tp_start,&tp_end)/1000000;
+		this_time = nsec_time_diff(&tp_end,&tp_start)/1000000;
 		put_total_time_ms += this_time;
 		put_total_size += state.nread;
 
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 00a3b97a98d..d1fb5ab8179 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -307,7 +307,7 @@ NODE_STATUS_STRUCT *node_status_query(int fd,
 	while (1) {
 		struct timespec tp2;
 		clock_gettime_mono(&tp2);
-		if (nsec_time_diff(&tp,&tp2)/1000000 > retry_time) {
+		if (nsec_time_diff(&tp2,&tp)/1000000 > retry_time) {
 			if (!retries)
 				break;
 			if (!found && !send_packet(&p))
@@ -716,7 +716,7 @@ struct sockaddr_storage *name_query(int fd,
 		struct timespec tp2;
 
 		clock_gettime_mono(&tp2);
-		if (nsec_time_diff(&tp,&tp2)/1000000 > retry_time) {
+		if (nsec_time_diff(&tp2,&tp)/1000000 > retry_time) {
 			if (!retries)
 				break;
 			if (!found && !send_packet(&p))