From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:47 +0000 (-0700)
Subject: lib/file: Use MIN macro
X-Git-Tag: stable-10.2.0~133
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=35683b97ced00c29b0e3f65ee50ec6740e143a8d;p=thirdparty%2Fopen-vm-tools.git

lib/file: Use MIN macro
---

diff --git a/open-vm-tools/lib/file/fileLockPrimitive.c b/open-vm-tools/lib/file/fileLockPrimitive.c
index 0ebe78286..7a5e52f8a 100644
--- a/open-vm-tools/lib/file/fileLockPrimitive.c
+++ b/open-vm-tools/lib/file/fileLockPrimitive.c
@@ -144,11 +144,7 @@ FileLockSleeper(LockValues *myValues)  // IN/OUT:
        * The lock has been around a while, linear back off with an upper bound.
        */
 
-      maxSleepTimeMsec = ageMsec/10;
-
-      if (maxSleepTimeMsec > 2000) {
-         maxSleepTimeMsec = 2000;
-      }
+      maxSleepTimeMsec = MIN(ageMsec / 10, 2000);
    }
 
    (void) FileSleeper(maxSleepTimeMsec / 10, maxSleepTimeMsec);