From 4cf8f5f46c0f80b49a2a70854372289c3fda932b Mon Sep 17 00:00:00 2001
From: Steffen Maier <maier@linux.ibm.com>
Date: Fri, 15 Jun 2018 20:26:13 +0200
Subject: [PATCH] lstape: fix to prevent error messages if there are non-zfcp
 SCSI devices
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Assume "N/A" for non-zfcp SCSI devices, such as iSCSI or virtio-scsi-ccw,
to not erroneously access absent zfcp-specific sysfs attributes.

Signed-off-by: Steffen Maier <maier@linux.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>
Reviewed-by: Jens Remus <jremus@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
---
 zconf/lstape | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/zconf/lstape b/zconf/lstape
index 91609fbb..3c779751 100755
--- a/zconf/lstape
+++ b/zconf/lstape
@@ -335,9 +335,13 @@ function SysfsCreateListSCSI()
 			$STATE
 
 		if $VERBOSE; then
+			HBA_ID="N/A"
+			[ -r $SCSI_DEV/hba_id ] && HBA_ID=$(cat $SCSI_DEV/hba_id)
+			WWPN="N/A"
+			[ -r $SCSI_DEV/wwpn ] && WWPN=$(cat $SCSI_DEV/wwpn)
 			printf "$SCSIVFORMAT" \
-				$(cat $SCSI_DEV/hba_id) \
-				$(cat $SCSI_DEV/wwpn) \
+				"$HBA_ID" \
+				"$WWPN" \
 				$TAPE_SERIAL
 		fi
 	done