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 <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Ben Kaduk 2010-06-20 18:54:26 -04:00 committed by Derrick Brashear
parent df38462c64
commit 1f2b84f1b6

View File

@ -3428,17 +3428,13 @@ DECL_PIOCTL(PFlushVolumeData)
goto loop; goto loop;
} }
#ifdef AFS_DARWIN80_ENV #ifdef AFS_DARWIN80_ENV
if (tvc->f.states & CDeadVnode) { if (tvc->f.states & CDeadVnode) {
if (!(tvc->f.states & CBulkFetching)) { if (!(tvc->f.states & CBulkFetching)) {
ReleaseReadLock(&afs_xvcache); ReleaseReadLock(&afs_xvcache);
afs_osi_Sleep(&tvc->f.states); afs_osi_Sleep(&tvc->f.states);
goto loop; 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); vp = AFSTOV(tvc);
if (vnode_get(vp)) if (vnode_get(vp))
continue; continue;