STABLE14-no-clid-for-bsd-20060313

Back out rev 1.28 for BSD.
On BSD, clid is not necessarily a pid.
Passing it to HandleFlock results in client hangs.

(cherry picked from commit b1883ef6ad619ffa1fb76caf5d3568f69c1e3136)

diff --git a/src/afs/VNOPS/afs_vnop_flock.c b/src/afs/VNOPS/afs_vnop_flock.c
index e86c2e2684e9fa2ea0331c9c4070fb66ccf27d01..e2eaf8ac67581b261c0bce73b1711e3606ad7598 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_flock.c
+++ b/src/afs/VNOPS/afs_vnop_flock.c
@@ -571,7 +571,7 @@ int afs_lockctl(struct vcache * avc, struct AFS_FLOCK * af, int acmd,
 #endif
        ) && code != LOCK_UN)
        code |= LOCK_NB;        /* non-blocking, s.v.p. */
-#if    defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_XBSD_ENV)
+#if    defined(AFS_OSF_ENV) || defined(AFS_DARWIN_ENV)
     code = HandleFlock(avc, code, &treq, clid, 0 /*!onlymine */ );
 #elif defined(AFS_SGI_ENV)
     AFS_RWLOCK((vnode_t *) avc, VRWLOCK_WRITE);