[PATCH] fix broken sas path_id

[PATCH] fix broken sas path_id

[MUNEDA Takahiro]

Hi,

path_id for SAS disk fails, because sysfs directory was changed.
This patch fix path_id.
I've tested this on 2.6.18.

$ sh path_id_orig /block/sda
path_id_orig: line 73: [: [0-9]*: integer expression expected
path_id_orig: line 211: 2/port-2:0/expander-2:0/port-2:0:0/end_device-2:0:0 - 2/port-2:0/expander-2:0/port-2:0:0/end_device-2:0:0: division by 0 (error token is "-2:0/expander-2:0/port-2:0:0/end_device-2:0:0 - 2/port-2:0/expander-2:0/port-2:0:0/end_device-2:0:0")

$ sh path_id /block/sda
ID_PATH=pci-0000:03:01.0-sas-0x500000e0f0000344:1:0-0x5000c5000021f631:0

Thanks,
MUNE

Signed-off-by: MUNEDA Takahiro <muneda.takahiro@jp.fujitsu.com>

---
 extras/path_id/path_id |   36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

Index: udev-101/extras/path_id/path_id
=================================--- udev-101.orig/extras/path_id/path_id
+++ udev-101/extras/path_id/path_id
@@ -278,15 +278,17 @@ handle_sas () {
 	local DEV=$1
 	local cil adapter controller_dev
 	# SAS device
-	sas_host_path="${DEV%%/phy*}"
+	sas_host_path="${DEV%%/port*}"
 	sas_phy_path="${DEV#*/host*/}"
 	sas_phy_path="${sas_phy_path%%/target*}"
 	sas_phy_id="${sas_phy_path%%/*}"
-	sas_rphy_id="${sas_phy_path##*/}"
-	sas_phy_dev="/sys/class/sas_phy/${sas_phy_id}"
+	sas_phy_id="${sas_phy_id##*port-}"
+	sas_port_id="${sas_phy_path%%/end_device*}"
+	sas_port_id="${sas_port_id##*port-}"
+	sas_end_id="${sas_phy_path##*end_device-}"
+	sas_phy_dev="/sys/class/sas_phy/phy-${sas_phy_id}"
 	if [ -e "$sas_phy_dev/sas_address" ]; then
 		read phy_address < $sas_phy_dev/sas_address
-		read phy_port < $sas_phy_dev/port_identifier
 		read phy_id < $sas_phy_dev/phy_identifier
 	fi
 	if [ -z "$phy_address" ] ; then
@@ -295,22 +297,32 @@ handle_sas () {
 		RESULT=1
 		return
 	fi
+	sas_port_dev="/sys/class/sas_port/port-${sas_port_id}"
+	if [ -e "$sas_port_dev/num_phys" ] ; then
+		read phy_port < $sas_port_dev/num_phys
+	fi
+	if [ -z "$phy_port" ] ; then
+		: no initiator address
+		D+		RESULT=1
+		return
+	fi
 	sas_phy_address="$phy_address:$phy_port:$phy_id"
-	sas_rphy_dev="/sys/class/sas_device/${sas_rphy_id}"
-	if [ -e "$sas_rphy_dev/sas_address" ]; then
-		read rphy_address < $sas_rphy_dev/sas_address
-		read rphy_id < $sas_rphy_dev/phy_identifier
+	sas_end_dev="/sys/class/sas_device/end_device-${sas_end_id}"
+	if [ -e "$sas_end_dev/sas_address" ]; then
+		read end_address < $sas_end_dev/sas_address
+		read end_id < $sas_end_dev/phy_identifier
 	fi
-	if [ -z "$rphy_address" ] ; then
+	if [ -z "$end_address" ] ; then
 		: no initiator address
 		D 		RESULT=1
 		return
 	fi
-	sas_rphy_address="$rphy_address:$rphy_id"
+	sas_end_address="$end_address:$end_id"
 	controller_dev="${sas_host_path%/host[0-9]*}"
 	# SAS devices are always endpoints
-	d="sas-${sas_phy_address}-${sas_rphy_address}"
+	d="sas-${sas_phy_address}-${sas_end_address}"
 	D="$controller_dev"
 	RESULT=0
 }
@@ -470,7 +482,7 @@ handle_device () {
 			*/rport-[0-9]*:[0-9]*-[0-9]*/*)
 				handle_fc "$D"
 				;;
-			*/phy-[0-9]*:[0-9]*/*)
+			*/end_device-[0-9]*:[0-9]*:[0-9]*/*)
 				handle_sas "$D"
 				;;
 			*/fw-host[0-9]*/*)

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CIDÞVDEV
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel

Re: [PATCH] fix broken sas path_id

[Kay Sievers]

On Mon, 2006-10-02 at 22:10 +0900, MUNEDA Takahiro wrote:
> path_id for SAS disk fails, because sysfs directory was changed.
> This patch fix path_id.
> I've tested this on 2.6.18.

Applied.

Thanks,
Kay


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CIDÞVDEV
_______________________________________________
Linux-hotplug-devel mailing list  http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel