From: Mike Meffie <mmeffie@sinenomine.net>
Date: Tue, 28 Apr 2009 15:37:51 +0000 (+0000)
Subject: DEVEL15-dafs-vol-offline-20090428
X-Git-Tag: openafs-devel-1_5_60~77
X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=3653ba4349334380a16348bc6c815e4b88a54429

DEVEL15-dafs-vol-offline-20090428

LICENSE IPL10
FIXES 124582

fix a logic error in the dafs vos offline support


(cherry picked from commit 5958aa0c4b0a9279a918cda1f37cb7e6c5666d44)
---

diff --git a/src/vol/volume.c b/src/vol/volume.c
index c28331e..f4b703f 100644
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -2337,10 +2337,13 @@ attach2(Error * ec, VolId volumeId, char *path, register struct VolumeHeader * h
 		break;
 
 	    case FSSYNC_VolOpRunningUnknown:
-		vp->pending_vol_op->vol_op_state = 
-		    (VVolOpLeaveOnline_r(vp, vp->pending_vol_op) ? 
-		     FSSYNC_VolOpRunningOnline : FSSYNC_VolOpRunningOffline);
-		/* fall through */
+		if (VVolOpLeaveOnline_r(vp, vp->pending_vol_op)) {
+		    vp->pending_vol_op->vol_op_state = FSSYNC_VolOpRunningOnline;
+		    break;
+		} else {
+		    vp->pending_vol_op->vol_op_state = FSSYNC_VolOpRunningOffline;
+		    /* fall through to take volume offline */
+		}
 
 	    case FSSYNC_VolOpRunningOffline:
 		/* mark the volume down */