add AFS_DEMAND_ATTACH_UTIL

[openafs.git] / src / vol / volume.h

diff --git a/src/vol/volume.h b/src/vol/volume.h
index 20694c5..a0ad8f5 100644 (file)
--- a/src/vol/volume.h
+++ b/src/vol/volume.h
@@ -101,8 +101,6 @@ extern pthread_t vol_glock_holder;
 #define VTRANS_LOCK MUTEX_ENTER(&vol_trans_mutex)
 #define VTRANS_UNLOCK MUTEX_EXIT(&vol_trans_mutex)
 #else /* AFS_PTHREAD_ENV */
-#define VOL_CV_WAIT(cv)
-#define VOL_CV_TIMEDWAIT(cv, ts, to)
 #define VOL_LOCK
 #define VOL_UNLOCK
 #define VSALVSYNC_LOCK
@@ -901,13 +899,15 @@ extern int VDeregisterVolOp_r(Volume * vp);
 extern void VCancelReservation_r(Volume * vp);
 extern int VChildProcReconnectFS_r(void);
 extern void VOfflineForVolOp_r(Error *ec, Volume *vp, char *message);
+#endif /* AFS_DEMAND_ATTACH_FS */
 
+#if defined(AFS_DEMAND_ATTACH_FS) || defined(AFS_DEMAND_ATTACH_UTIL)
 struct VDiskLock;
 extern void VDiskLockInit(struct VDiskLock *dl, struct VLockFile *lf,
                           afs_uint32 offset);
 extern int VGetDiskLock(struct VDiskLock *dl, int locktype, int nonblock);
 extern void VReleaseDiskLock(struct VDiskLock *dl, int locktype);
-#endif /* AFS_DEMAND_ATTACH_FS */
+#endif /* AFS_DEMAND_ATTACH_FS || AFS_DEMAND_ATTACH_UTIL */
 extern int VVolOpLeaveOnline_r(Volume * vp, FSSYNC_VolOp_info * vopinfo);
 extern int VVolOpLeaveOnlineNoHeader_r(Volume * vp, FSSYNC_VolOp_info * vopinfo);
 extern int VVolOpSetVBusy_r(Volume * vp, FSSYNC_VolOp_info * vopinfo);