generic-inline-20080924

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

diff --git a/src/vol/volume_inline.h b/src/vol/volume_inline.h
index 35945d6..4883b43 100644 (file)
--- a/src/vol/volume_inline.h
+++ b/src/vol/volume_inline.h
@@ -12,15 +12,6 @@
 
 #include "volume.h"
 
-#ifdef AFS_HPUX_ENV
-#define static_inline static __inline
-#elif defined(AFS_AIX_ENV) || defined(AFS_SGI_ENV)
-#define static_inline static
-#else
-#define static_inline static inline
-#endif
-
-
 /***************************************************/
 /* demand attach fs state machine routines         */
 /***************************************************/
@@ -37,8 +28,6 @@
  *   @retval 1  yes, state is mutually exclusive
  *
  * @note DEMAND_ATTACH_FS only
- *
- * @note should VOL_STATE_SALVSYNC_REQ be treated as exclusive?
  */
 static_inline int
 VIsExclusiveState(VolState state)
@@ -51,6 +40,7 @@ VIsExclusiveState(VolState state)
     case VOL_STATE_HDR_ATTACHING:
     case VOL_STATE_OFFLINING:
     case VOL_STATE_DETACHING:
+    case VOL_STATE_SALVSYNC_REQ:
     case VOL_STATE_VNODE_ALLOC:
     case VOL_STATE_VNODE_GET:
     case VOL_STATE_VNODE_CLOSE: