From a3e37953fe59ee51b9130b7997741c47b821cf5f Mon Sep 17 00:00:00 2001
From: Steffen Maier <maier@linux.ibm.com>
Date: Tue, 19 Feb 2019 18:09:53 +0100
Subject: [PATCH] lszfcp: fix missing block & sg device output without
 CONFIG_SYSFS_DEPRECATED
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

lszfcp -DVe was missing a 3rd SCSI device header line like:

/sys/devices/css0/0.0.0019/0.0.1880/0x50050763031bd327/0x4045400000000000
/sys/bus/ccw/drivers/zfcp/0.0.1880/host0/rport-0:0-0/target0:0:0/0:0:0:1073758277
/sys/block/sda /sys/class/scsi_generic/sg0

Signed-off-by: Steffen Maier <maier@linux.ibm.com>
Reviewed-by: Jens Remus <jremus@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
---
 zconf/lszfcp   | 19 +++++++++++++++++--
 zconf/lszfcp.8 |  8 ++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/zconf/lszfcp b/zconf/lszfcp
index 572a83b2..3fca53a6 100755
--- a/zconf/lszfcp
+++ b/zconf/lszfcp
@@ -2,7 +2,7 @@
 #
 # lszfcp - Tool to display information about zfcp devices (adapters/ports/units)
 #
-# Copyright IBM Corp. 2006, 2017
+# Copyright IBM Corp. 2006, 2019
 #
 # s390-tools is free software; you can redistribute it and/or modify
 # it under the terms of the MIT license. See LICENSE for details.
@@ -67,7 +67,7 @@ print_version()
 {
 	cat <<EOF
 $SCRIPTNAME: version %S390_TOOLS_VERSION%
-Copyright IBM Corp. 2006, 2017
+Copyright IBM Corp. 2006, 2019
 EOF
 }
 
@@ -272,6 +272,21 @@ show_devices()
 				echo -n "$SYSFS/block/${BLOCK_DEV#*:} "
 				echo "$SYSFS/class/scsi_generic/${GEN_DEV#*:}"
 
+			elif [ -d $SCSI_DEVICE_PATH/block ] && $SHOW_EXTENDED
+			then
+				# case without CONFIG_SYSFS_DEPRECATED
+				BLOCK_DEV=$(echo $SCSI_DEVICE_PATH/block/*)
+				BLOCK_DEV=${BLOCK_DEV##*/}
+				echo -n "$SYSFS/block/$BLOCK_DEV "
+				local SGPATH=$SCSI_DEVICE_PATH/scsi_generic
+				if [ -d $SGPATH ]; then
+					GEN_DEV=$(echo $SGPATH/*)
+					GEN_DEV=${GEN_DEV##*/}
+					echo "$SYSFS/class/scsi_generic/$GEN_DEV"
+				else
+					echo "-"
+				fi
+
 			# FIXME Find a way to assign the generic devices.
 			elif [ -r $SYSFS/../runtime.out ]; then
 				SCSI_DEV=`basename $SCSI_DEVICE_PATH`
diff --git a/zconf/lszfcp.8 b/zconf/lszfcp.8
index 9b522304..0e8fed1a 100644
--- a/zconf/lszfcp.8
+++ b/zconf/lszfcp.8
@@ -1,8 +1,8 @@
-.\" Copyright IBM Corp. 2006, 2017
+.\" Copyright IBM Corp. 2006, 2019
 .\" s390-tools is free software; you can redistribute it and/or modify
 .\" it under the terms of the MIT license. See LICENSE for details.
 .\"
-.TH LSZFCP 8 "Mar 2008" "s390-tools"
+.TH LSZFCP 8 "Feb 2019" "s390-tools"
 .SH NAME
 lszfcp \- list information about zfcp adapters, ports, and units
 
@@ -37,6 +37,8 @@ device names are listed.
 
 Option "-V" additionally shows the sysfs paths of interest for the
 listed object.
+If a SCSI device has an associated block device (disk)
+and SCSI generic (sg) device, show their sysfs paths in a 3rd line.
 
 Option "-a" additionally shows all attributes of interest found in
 sysfs for the listed object.
@@ -77,6 +79,8 @@ Generate extended output.
 .B -V, --verbose
 Generate verbose output. Display sysfs path names of class and bus
 devices that are of interest for this object.
+If a SCSI device has an associated block device (disk)
+and SCSI generic (sg) device, show their sysfs paths in a 3rd line.
 .TP
 .B -s, --sysfs /path/to/sys
 Use path as sysfs (for dbginfo archives).