Back out rev 1.28 for BSD.
On BSD, clid is not necessarily a pid.
Passing it to HandleFlock results in client hangs.
#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);
code = afsrename(adp, aname, adp, unlname, acred, &treq);
Tnam1 = unlname;
if (!code) {
- char *oldmvid = NULL;
+ struct VenusFid *oldmvid = NULL;
if (tvc->mvid)
oldmvid = tvc->mvid;
tvc->mvid = (struct VenusFid *)unlname;