From: Michael Meffie <mmeffie@sinenomine.net>
Date: Wed, 4 Sep 2013 19:10:16 +0000 (-0400)
Subject: volscan: avoid printing null mount-point cellname
X-Git-Tag: upstream/1.6.10_pre1^2~9
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=833607e4119c308e229eb1b2735e64c82c6abd09;p=packages%2Fo%2Fopenafs.git

volscan: avoid printing null mount-point cellname

The 'mcell' field is null when there is no cell set in the mount point,
so do not try to print it.

Reviewed-on: http://gerrit.openafs.org/10226
Reviewed-by: D Brashear <shadow@your-file-system.com>
Tested-by: D Brashear <shadow@your-file-system.com>
(cherry picked from commit db2ed13359ce8e3cd6a4981f8ce8e10ba61f6463)

Change-Id: I96ba7dec59cc6e0fc5663e8e037d76d1006905a7
Reviewed-on: http://gerrit.openafs.org/11275
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/vol/vol-info.c b/src/vol/vol-info.c
index b46980bcb..5eccbb07a 100644
--- a/src/vol/vol-info.c
+++ b/src/vol/vol-info.c
@@ -2521,7 +2521,7 @@ PrintColumns(struct VnodeDetails *vdp, const char *desc)
 	    break;
 	case col_mcell:
 	    printf("%s",
-		   (vdp->t == VNODE_U_MOUNT ? vdp->u.mnt.cell : PLACEHOLDER));
+		   (vdp->t == VNODE_U_MOUNT && vdp->u.mnt.cell ? vdp->u.mnt.cell : PLACEHOLDER));
 	    break;
 	case col_mvol:
 	    printf("%s",