From: Adam Megacz <megacz@cs.berkeley.edu>
Date: Thu, 15 Feb 2007 00:33:39 +0000 (+0000)
Subject: java-locking-redux-20070214
X-Git-Tag: BP-openafs-windows-kdfs-ifs~788
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=65d89232521ceb1641ce0a14e1f3ed8d28b6afff;p=packages%2Fo%2Fopenafs.git

java-locking-redux-20070214


change the -1 len check for java locks slightly
---

diff --git a/src/afs/VNOPS/afs_vnop_flock.c b/src/afs/VNOPS/afs_vnop_flock.c
index 6b3b30ce9..9d9f3842b 100644
--- a/src/afs/VNOPS/afs_vnop_flock.c
+++ b/src/afs/VNOPS/afs_vnop_flock.c
@@ -26,6 +26,10 @@ RCSID
 #include "afs/afs_osidnlc.h"
 #include "afs/unified_afs.h"
 
+#ifndef OFFSET_MAX
+#define OFFSET_MAX 0x7fffffffffffffff
+#endif
+
 /* Static prototypes */
 static int HandleGetLock(register struct vcache *avc,
 			 register struct AFS_FLOCK *af,
@@ -549,7 +553,7 @@ int afs_lockctl(struct vcache * avc, struct AFS_FLOCK * af, int acmd,
 #endif
     /* Java VMs ask for l_len=(long)-1 regardless of OS/CPU; bottom 32 bits
      * sometimes get masked off by OS */
-    if ((af->l_len >> 32) == 0x7fffffff)
+    if (af->l_len == OFFSET_MAX-1)
 	af->l_len = 0;
     /* next line makes byte range locks always succeed,
      * even when they should block */