DEVEL15-death-to-longc-procs-20060804

[openafs.git] / src / afs / VNOPS / afs_vnop_flock.c

diff --git a/src/afs/VNOPS/afs_vnop_flock.c b/src/afs/VNOPS/afs_vnop_flock.c
index 6bca616..0e6e6d8 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_flock.c
+++ b/src/afs/VNOPS/afs_vnop_flock.c
@@ -485,8 +485,13 @@ DoLockWarning(void)
 
     /* otherwise, it is time to nag the user */
     lastWarnTime = now;
+#ifdef AFS_LINUX26_ENV
+    afs_warn
+       ("afs: byte-range locks only enforced for processes on this machine.\n");
+#else
     afs_warn
        ("afs: byte-range lock/unlock ignored; make sure no one else is running this program.\n");
+#endif
 }
 
 
@@ -570,7 +575,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 ((sizeof(af->l_len) == 8) && (af->l_len == 0x7ffffffffffffffe))
+    if ((sizeof(af->l_len) == 8) && (af->l_len == 0x7ffffffffffffffeLL))
        af->l_len = 0;
     /* next line makes byte range locks always succeed,
      * even when they should block */
@@ -982,11 +987,7 @@ afs_xflock(void)
     return code;
 #else /* AFS_OSF_ENV */
     if (!flockDone)
-#ifdef DYNEL
-       (*afs_longcall_procs.LC_flock) ();
-#else
        flock();
-#endif
     AFS_DISCON_UNLOCK();
     afs_PutFakeStat(&fakestate);
     return;