STABLE14-macos-locking-behavior-20060117

FIXES 25543

F_UNLCK is send as a command, remap to F_SETLK like everyone else

(cherry picked from commit b81d0cf8af1c5788de399b630545945004f65345)

diff --git a/src/afs/DARWIN/osi_vnodeops.c b/src/afs/DARWIN/osi_vnodeops.c
index 9515650634328cf723b46b409f58d695cdd4afe8..258fbdad83b82b58d7c3d58d5dd7d33a3032976c 100644 (file)
--- a/src/afs/DARWIN/osi_vnodeops.c
+++ b/src/afs/DARWIN/osi_vnodeops.c
@@ -1727,7 +1727,9 @@ afs_vop_advlock(ap)
 #endif
     AFS_GLOCK();
     error =
-       afs_lockctl(VTOAFS(ap->a_vp), ap->a_fl, ap->a_op, tcr, (int)ap->a_id);
+       afs_lockctl(VTOAFS(ap->a_vp), ap->a_fl,
+                   ap->a_op == F_UNLCK ? F_SETLK : ap->a_op, tcr, 
+                   (int)ap->a_id);
     AFS_GUNLOCK();
     return error;
 }