From 1f2b84f1b64625af449070eccb64639d6a8f0a12 Mon Sep 17 00:00:00 2001 From: Ben Kaduk Date: Sun, 20 Jun 2010 18:54:26 -0400 Subject: [PATCH] Simplify preprocessor logic in afs_pioctl We had identical code in two branches of an if/elif/else path. Merge them together. This allows two DARWIN80_ENV blocks to be coalesced; reindent them correctly while we're here. Change-Id: Icaa047994ec970ee8187a7811ee69de2f36a0503 Reviewed-on: http://gerrit.openafs.org/2222 Tested-by: Derrick Brashear Reviewed-by: Derrick Brashear --- src/afs/afs_pioctl.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c index 2f46e170e0..54d222497f 100644 --- a/src/afs/afs_pioctl.c +++ b/src/afs/afs_pioctl.c @@ -3428,17 +3428,13 @@ DECL_PIOCTL(PFlushVolumeData) goto loop; } #ifdef AFS_DARWIN80_ENV - if (tvc->f.states & CDeadVnode) { - if (!(tvc->f.states & CBulkFetching)) { - ReleaseReadLock(&afs_xvcache); - afs_osi_Sleep(&tvc->f.states); - goto loop; + if (tvc->f.states & CDeadVnode) { + if (!(tvc->f.states & CBulkFetching)) { + ReleaseReadLock(&afs_xvcache); + afs_osi_Sleep(&tvc->f.states); + goto loop; + } } - } -#endif -#if defined(AFS_SGI_ENV) || defined(AFS_SUN5_ENV) || defined(AFS_HPUX_ENV) || defined(AFS_LINUX20_ENV) - AFS_FAST_HOLD(tvc); -#elif defined(AFS_DARWIN80_ENV) vp = AFSTOV(tvc); if (vnode_get(vp)) continue;