diff options
| author | Stefan Metzmacher <metze@samba.org> | 2019-08-13 19:19:07 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2019-09-09 16:04:28 +0000 |
| commit | 75e07d485944fdc76a6510bf5d450959475e7e5b (patch) | |
| tree | b5464c3c4a64401b800614870500513080b3a6d8 | |
| parent | f73b670b4db103069aa151d3af4ed7a92ce581c3 (diff) | |
| download | samba-75e07d485944fdc76a6510bf5d450959475e7e5b.tar.gz | |
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>
(cherry picked from commit 3b788d97f9995e24e4005567f90a925957fb1e00)
| -rw-r--r-- | source3/smbd/blocking.c | 16 | ||||
| -rw-r--r-- | source3/smbd/proto.h | 2 |
2 files changed, 0 insertions, 18 deletions
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 37eeb9f31ca..b59f1f4123d 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, |