From: Chaskiel M Grundman <cg2v@andrew.cmu.edu>
Date: Tue, 17 Jan 2006 17:06:42 +0000 (+0000)
Subject: STABLE14-macos-locking-behavior-20060117
X-Git-Tag: openafs-stable-1_4_1-rc5~21
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=6392ea2d492b84ccfaeb10ebe38ae4f2d035d79d;p=packages%2Fo%2Fopenafs.git

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 951565063..258fbdad8 100644
--- 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;
 }