From 4ed61f09c8743391d40e4e0e77c3876cdd4211ab Mon Sep 17 00:00:00 2001 From: Jim Rees Date: Tue, 24 Oct 2006 14:42:16 +0000 Subject: [PATCH] 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) --- src/afs/VNOPS/afs_vnop_flock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/afs/VNOPS/afs_vnop_flock.c b/src/afs/VNOPS/afs_vnop_flock.c index e86c2e268..e2eaf8ac6 100644 --- 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); -- 2.39.5