From f99a2a522da9d78e08db2d6831f16480677b027c Mon Sep 17 00:00:00 2001 From: Adam Megacz Date: Thu, 15 Feb 2007 00:35:04 +0000 Subject: [PATCH] DEVEL15-java-locking-redux-20070214 change the -1 len check for java locks slightly (cherry picked from commit 65d89232521ceb1641ce0a14e1f3ed8d28b6afff) --- src/afs/VNOPS/afs_vnop_flock.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/afs/VNOPS/afs_vnop_flock.c b/src/afs/VNOPS/afs_vnop_flock.c index af942f18f..77f91039c 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 */ -- 2.39.5