From: Andrew Deason <adeason@sinenomine.net>
Date: Wed, 30 Nov 2011 23:41:53 +0000 (-0600)
Subject: DAFS: Ensure logging on attach2 errors
X-Git-Tag: upstream/1.6.1.pre1^2~15
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=903e78e1a27ecc309246f7130112d4e145bb047f;p=packages%2Fo%2Fopenafs.git

DAFS: Ensure logging on attach2 errors

The attach2 error path transitions a volume to VOL_STATE_ERROR, in
case whatever got us to that error path did not already put the volume
in an appropriate state. Log when we do this, to make sure we do not
end up with a volume in VOL_STATE_ERROR state silently.

Reviewed-on: http://gerrit.openafs.org/6168
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit 53230846a202a50f6c3a61b38d62ccba8876f89d)

Change-Id: I4dbe5c6f8be8820620e7a68c7f42b426211dbb82
Reviewed-on: http://gerrit.openafs.org/6324
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/vol/volume.c b/src/vol/volume.c
index c38b86ec3..d44c701bf 100644
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -3420,6 +3420,10 @@ unlocked_error:
 locked_error:
 #ifdef AFS_DEMAND_ATTACH_FS
     if (!VIsErrorState(V_attachState(vp))) {
+	if (VIsErrorState(error_state)) {
+	    Log("attach2: forcing vol %u to error state (state %u flags 0x%x ec %d)\n",
+	        vp->hashid, V_attachState(vp), V_attachFlags(vp), *ec);
+	}
 	VChangeState_r(vp, error_state);
     }
 #endif /* AFS_DEMAND_ATTACH_FS */