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 ca8a625ba9dd1725ca9b1844d64ce9d662913881..cdc4613270e209690573802c206c618ecff8c6b8 100644 (file)
--- 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 607bd54dd790676ec47db74175034da9191eaee8..ef24cf0578d455674fe5800f1d1a3021431ab745 100644 (file)
--- 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,