From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 13 Aug 2019 17:19:07 +0000 (+0200)
Subject: s3:blocking: remove unused timeval_brl_min()
X-Git-Tag: talloc-2.3.1~978
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b788d97f9995e24e4005567f90a925957fb1e00;p=thirdparty%2Fsamba.git

s3:blocking: remove unused timeval_brl_min()

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14113

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
---

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index ca8a625ba9d..cdc4613270e 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -28,22 +28,6 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_LOCKING
 
-/****************************************************************************
- We need a version of timeval_min that treats zero timval as infinite.
-****************************************************************************/
-
-struct timeval timeval_brl_min(const struct timeval *tv1,
-					const struct timeval *tv2)
-{
-	if (timeval_is_zero(tv1)) {
-		return *tv2;
-	}
-	if (timeval_is_zero(tv2)) {
-		return *tv1;
-	}
-	return timeval_min(tv1, tv2);
-}
-
 NTSTATUS smbd_do_locks_try(
 	struct files_struct *fsp,
 	enum brl_flavour lock_flav,
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 607bd54dd79..ef24cf0578d 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -95,8 +95,6 @@ bool aio_add_req_to_fsp(files_struct *fsp, struct tevent_req *req);
 
 /* The following definitions come from smbd/blocking.c  */
 
-struct timeval timeval_brl_min(const struct timeval *tv1,
-			const struct timeval *tv2);
 NTSTATUS smbd_do_locks_try(
 	struct files_struct *fsp,
 	enum brl_flavour lock_flav,