chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
178b824
)
path_id: fix SAS disk handling
author
MUNEDA Takahiro
<muneda.takahiro@jp.fujitsu.com>
Mon, 2 Oct 2006 14:02:42 +0000
(16:02 +0200)
committer
Kay Sievers
<kay.sievers@suse.de>
Mon, 2 Oct 2006 14:02:42 +0000
(16:02 +0200)
extras/path_id/path_id
patch
|
blob
|
history
diff --git
a/extras/path_id/path_id
b/extras/path_id/path_id
index a9182af6e07ba0674bea9d8447d682ed57f5d58d..44754cdedd23888e1051d9992c42cee16b269c43 100644
(file)
--- a/
extras/path_id/path_id
+++ b/
extras/path_id/path_id
@@
-278,15
+278,17
@@
handle_sas () {
local DEV=$1
local cil adapter controller_dev
# SAS device
local DEV=$1
local cil adapter controller_dev
# SAS device
- sas_host_path="${DEV%%/p
hy
*}"
+ sas_host_path="${DEV%%/p
ort
*}"
sas_phy_path="${DEV#*/host*/}"
sas_phy_path="${sas_phy_path%%/target*}"
sas_phy_id="${sas_phy_path%%/*}"
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
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
read phy_id < $sas_phy_dev/phy_identifier
fi
if [ -z "$phy_address" ] ; then
@@
-295,22
+297,32
@@
handle_sas () {
RESULT=1
return
fi
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_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
fi
- if [ -z "$
rphy
_address" ] ; then
+ if [ -z "$
end
_address" ] ; then
: no initiator address
D=
RESULT=1
return
fi
: 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
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
}
D="$controller_dev"
RESULT=0
}
@@
-470,7
+482,7
@@
handle_device () {
*/rport-[0-9]*:[0-9]*-[0-9]*/*)
handle_fc "$D"
;;
*/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]*/*)
handle_sas "$D"
;;
*/fw-host[0-9]*/*)