From 138ac6577eab40e25a796f7c18f3c39add000ed2 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Mon, 1 Nov 2010 15:34:26 -0500 Subject: [PATCH] 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. Change-Id: I7b19a3c2cad8b7233eb03a83598f9bf95db5ac65 Reviewed-on: http://gerrit.openafs.org/3213 Tested-by: BuildBot Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/vol/volume.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/vol/volume.c b/src/vol/volume.c index 1b05888..d93c63c 100644 --- a/src/vol/volume.c +++ b/src/vol/volume.c @@ -4632,11 +4632,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 -- 1.9.4