X-Git-Url: http://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fvol%2Fvolume_inline.h;h=571f3084b2d4aa369eed757e8320b32f12c2674e;hp=dd48623bfde5c03e0e8f499d4e387a411f661e22;hb=04bcfa2821c9deba151f562bb78452276d8d7443;hpb=9b245d856b165f195b0da93df77e4a28a1698b46

diff --git a/src/vol/volume_inline.h b/src/vol/volume_inline.h
index dd48623..571f308 100644
--- a/src/vol/volume_inline.h
+++ b/src/vol/volume_inline.h
@@ -13,7 +13,7 @@
 #include "volume.h"
 #include "partition.h"
 
-#ifdef AFS_DEMAND_ATTACH_FS
+#if defined(AFS_DEMAND_ATTACH_FS) || defined(AFS_DEMAND_ATTACH_UTIL)
 # include "lock.h"
 #endif
 
@@ -85,7 +85,7 @@ VIsSalvager(ProgramType type)
 static_inline int
 VRequiresPartLock(void)
 {
-#ifdef AFS_DEMAND_ATTACH_FS
+#if defined(AFS_DEMAND_ATTACH_FS) || defined(AFS_DEMAND_ATTACH_UTIL)
     return 0;
 #else
     switch (programType) {
@@ -95,7 +95,7 @@ VRequiresPartLock(void)
     default:
         return 0;
     }
-#endif /* AFS_DEMAND_ATTACH_FS */
+#endif /* AFS_DEMAND_ATTACH_FS || AFS_DEMAND_ATTACH_UTIL */
 }
 
 /**
@@ -151,7 +151,7 @@ VShouldCheckInUse(int mode)
     return 0;
 }
 
-#ifdef AFS_DEMAND_ATTACH_FS
+#if defined(AFS_DEMAND_ATTACH_FS) || defined(AFS_DEMAND_ATTACH_UTIL)
 /**
  * acquire a non-blocking disk lock for a particular volume id.
  *
@@ -270,6 +270,9 @@ VVolLockType(int mode, int writeable)
 	}
     }
 }
+#endif /* AFS_DEMAND_ATTACH_FS || AFS_DEMAND_ATTACH_UTIL */
+
+#ifdef AFS_DEMAND_ATTACH_FS
 
 /**
  * tells caller whether or not the volume is effectively salvaging.