scsi: zfcp: move the position of put_device
Subsystems (2)
PATCH v2 1/1 scsi: zfcp: move the position of put_device
Have the put_device() call after device_unregister() in both zfcp_unit_remove() and zfcp_sysfs_port_remove_store() to make it more natural, for put_device() ought to be the last time we touch the object in both functions.
And add comments after put_device to make codes clearer.
---
v2: add comments after put_device as Steffen suggested.
drivers/s390/scsi/zfcp_sysfs.c | 4 ++-- drivers/s390/scsi/zfcp_unit.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/s390/scsi/zfcp_sysfs.c +2 -2
@@ -327,10 +327,10 @@ static ssize_t zfcp_sysfs_port_remove_store(struct device *dev,list_del (&port->list);write_unlock_irq (&adapter->port_list_lock); -put_device (&port->dev); -zfcp_erp_port_shutdown (port,0 ,"syprs_1" );device_unregister (&port->dev); + +put_device (&port->dev);/* undo zfcp_get_port_by_wwpn() */ out:zfcp_ccw_adapter_put (adapter);return retval ? retval : (ssize_t ) count;
drivers/s390/scsi/zfcp_unit.c +2 -2
@@ -255,9 +255,9 @@ int zfcp_unit_remove(struct zfcp_port *port, u64 fcp_lun)scsi_device_put (sdev); } -put_device (&unit->dev); -device_unregister (&unit->dev); +put_device (&unit->dev);/* undo _zfcp_unit_find() */ +return 0 ; }
Signature · 1 line
2.23.0
Quoted 10 lines · Qinglang Miao
Have the
put_device()call afterdevice_unregister()in bothzfcp_unit_remove()andzfcp_sysfs_port_remove_store()to make it more natural, forput_device()ought to be the last time we touch the object in both functions.And add comments after
put_deviceto make codes clearer.Suggested-by Steffen Maier <[email protected]>Suggested-by Benjamin Block <[email protected]>Signed-off-by Qinglang Miao <[email protected]>
Quoted 7 lines
---
v2: add comments afterput_deviceas Steffen suggested.drivers/s390/scsi/zfcp_sysfs.c | 4 ++-- drivers/s390/scsi/zfcp_unit.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
Got a bit delayed.
Looks good, I queue it, and we send it with the changes for 5.12 once the merge window for 5.11 is over.
Thanks.
Signature · 4 lines
Best Regards, Benjamin Block / Linux on IBM Z Kernel Development / IBM Systems IBM Deutschland Research & Development GmbH / https://www.ibm.com/privacy Vorsitz. AufsR.: Gregor Pillen / Gesch�ftsf�hrung: Dirk Wittkopp Sitz der Gesellschaft: B�blingen / Registergericht: AmtsG Stuttgart, HRB 243294