smbd: Simplify an if-expression in smbd_do_locking()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 2388fae1b3c1d372c3aa5ab0c6b59d6f347d0c7b..188bc4e900bc7485c0f8985b18ee33ca4129655e 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -8176,8 +8176,8 @@ NTSTATUS smbd_do_locking(struct smb_request *req,
                        if (br_lck && blocking_lock && ERROR_WAS_LOCK_DENIED(status)) {
                                /* Windows internal resolution for blocking locks seems
                                   to be about 200ms... Don't wait for less than that. JRA. */
-                               if (timeout != -1 && timeout < lp_lock_spin_time()) {
-                                       timeout = lp_lock_spin_time();
+                               if (timeout != -1) {
+                                       timeout = MAX(timeout, lp_lock_spin_time());
                                }
                                defer_lock = true;
                        }