diff options
| author |   Steffen Maier <maier@linux.vnet.ibm.com> | 2012-09-04 15:23:34 +0200 |
|---|---|---|
| committer |   James Bottomley <JBottomley@Parallels.com> | 2012-09-24 12:11:02 +0400 |
| commit | d99b601b63386f3395dc26a699ae703a273d9982 (patch) | |
| tree | 208966f18e89775d68e82092c1ff648206fbd688 /drivers/s390/scsi/zfcp_aux.c | |
| parent | [SCSI] zfcp: remove invalid reference to list iterator variable (diff) | |
| download | linux-dev-d99b601b63386f3395dc26a699ae703a273d9982.tar.xz linux-dev-d99b601b63386f3395dc26a699ae703a273d9982.zip | |
[SCSI] zfcp: restore refcount check on port_remove
Upstream commit f3450c7b917201bb49d67032e9f60d5125675d6a
"[SCSI] zfcp: Replace local reference counting with common kref"
accidentally dropped a reference count check before tearing down
zfcp_ports that are potentially in use by zfcp_units.
Even remote ports in use can be removed causing
unreachable garbage objects zfcp_ports with zfcp_units.
Thus units won't come back even after a manual port_rescan.
The kref of zfcp_port->dev.kobj is already used by the driver core.
We cannot re-use it to track the number of zfcp_units.
Re-introduce our own counter for units per port
and check on port_remove.
Signed-off-by: Steffen Maier <maier@linux.vnet.ibm.com>
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: <stable@vger.kernel.org> #2.6.33+
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/s390/scsi/zfcp_aux.c')
| -rw-r--r-- | drivers/s390/scsi/zfcp_aux.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c index aff8621de806..f6adde44f226 100644 --- a/drivers/s390/scsi/zfcp_aux.c +++ b/drivers/s390/scsi/zfcp_aux.c @@ -519,6 +519,7 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn, rwlock_init(&port->unit_list_lock); INIT_LIST_HEAD(&port->unit_list); + atomic_set(&port->units, 0); INIT_WORK(&port->gid_pn_work, zfcp_fc_port_did_lookup); INIT_WORK(&port->test_link_work, zfcp_fc_link_test_work); |