From: Tom Keiser <tkeiser@gmail.com>
Date: Thu, 10 Jul 2008 19:14:54 +0000 (+0000)
Subject: DEVEL15-dafs-update-exclusive-states-20080710
X-Git-Tag: openafs-devel-1_5_50~27
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=60e40b44a96fdfb3f86b5de1aff377e3e3a4963a;p=packages%2Fo%2Fopenafs.git

DEVEL15-dafs-update-exclusive-states-20080710

LICENSE IPL10

VOL_STATE_SALVSYNC_REQ is a mutally exclusive state. don't allow other things
to attempt to trigger that state when an exclusive state is already present


(cherry picked from commit f52f1522367819712ea678b4e3cdf4644571fc57)
---

diff --git a/src/vol/volume_inline.h b/src/vol/volume_inline.h
index 35945d677..89f40a6b9 100644
--- a/src/vol/volume_inline.h
+++ b/src/vol/volume_inline.h
@@ -37,8 +37,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 +49,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: