From: Andrew Deason <adeason@sinenomine.net>
Date: Mon, 1 Nov 2010 20:34:26 +0000 (-0500)
Subject: Cleanup VOffline log message for non-DAFS
X-Git-Tag: upstream/1.6.6_pre2^2~113
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=de79977537f46cfc670136b8e5f7162e0f87c689;p=packages%2Fo%2Fopenafs.git

Cleanup VOffline log message for non-DAFS

Commit fd592c7674d4aa44dda90998b54d7b56947f6ed8 fixed the 'Volume X
(Y) is now offline' message for DAFS, but the same problem persists
for non-DAFS. Fix the non-DAFS case.

Reviewed-on: http://gerrit.openafs.org/3213
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 138ac6577eab40e25a796f7c18f3c39add000ed2)

Change-Id: I3e0c53d93bcaad43a9fd7b20ccf32bc216601455
Reviewed-on: http://gerrit.openafs.org/9412
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
---

diff --git a/src/vol/volume.c b/src/vol/volume.c
index 44e4238e4..7e917a817 100644
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -4980,11 +4980,14 @@ VCheckOffline(Volume * vp)
 	VUpdateVolume_r(&error, vp, 0);
 	VCloseVolumeHandles_r(vp);
 	if (LogLevel) {
-	    Log("VOffline: Volume %u (%s) is now offline", V_id(vp),
-		V_name(vp));
-	    if (V_offlineMessage(vp)[0])
-		Log(" (%s)", V_offlineMessage(vp));
-	    Log("\n");
+	    if (V_offlineMessage(vp)[0]) {
+		Log("VOffline: Volume %lu (%s) is now offline (%s)\n",
+		    afs_printable_uint32_lu(V_id(vp)), V_name(vp),
+		    V_offlineMessage(vp));
+	    } else {
+		Log("VOffline: Volume %lu (%s) is now offline\n",
+		    afs_printable_uint32_lu(V_id(vp)), V_name(vp));
+	    }
 	}
 	FreeVolumeHeader(vp);
 #ifdef AFS_PTHREAD_ENV