Skip to content

Commit

Permalink
[SCSI] qla2xxx: Add qla2x00_free_fcports() function
Browse files Browse the repository at this point in the history
This function was added to encapsulate freeing the memory for all the fcports
associated with a particular vha.  Also added a call to qla2x00_free_fcports()
to qla2x00_free_device() to free the memory for all the fcports associated with
a vha during device removal.

Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
  • Loading branch information
Chad Dupuis authored and James Bottomley committed Jul 28, 2010
1 parent 14e303d commit 8867048
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 deletions.
7 changes: 1 addition & 6 deletions drivers/scsi/qla2xxx/qla_attr.c
Original file line number Diff line number Diff line change
Expand Up @@ -1827,7 +1827,6 @@ static int
qla24xx_vport_delete(struct fc_vport *fc_vport)
{
scsi_qla_host_t *vha = fc_vport->dd_data;
fc_port_t *fcport, *tfcport;
struct qla_hw_data *ha = vha->hw;
uint16_t id = vha->vp_idx;

Expand All @@ -1841,11 +1840,7 @@ qla24xx_vport_delete(struct fc_vport *fc_vport)

scsi_remove_host(vha->host);

list_for_each_entry_safe(fcport, tfcport, &vha->vp_fcports, list) {
list_del(&fcport->list);
kfree(fcport);
fcport = NULL;
}
qla2x00_free_fcports(vha);

qla24xx_deallocate_vp_id(vha);

Expand Down
1 change: 1 addition & 0 deletions drivers/scsi/qla2xxx/qla_gbl.h
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ extern struct scsi_qla_host *qla2x00_create_host(struct scsi_host_template *,
extern void qla2x00_free_host(struct scsi_qla_host *);
extern void qla2x00_relogin(struct scsi_qla_host *);
extern void qla2x00_do_work(struct scsi_qla_host *);
extern void qla2x00_free_fcports(struct scsi_qla_host *);

/*
* Global Functions in qla_mid.c source file.
Expand Down
13 changes: 13 additions & 0 deletions drivers/scsi/qla2xxx/qla_os.c
Original file line number Diff line number Diff line change
Expand Up @@ -2487,11 +2487,24 @@ qla2x00_free_device(scsi_qla_host_t *vha)

qla2x00_free_irqs(vha);

qla2x00_free_fcports(vha);

qla2x00_mem_free(ha);

qla2x00_free_queues(ha);
}

void qla2x00_free_fcports(struct scsi_qla_host *vha)
{
fc_port_t *fcport, *tfcport;

list_for_each_entry_safe(fcport, tfcport, &vha->vp_fcports, list) {
list_del(&fcport->list);
kfree(fcport);
fcport = NULL;
}
}

static inline void
qla2x00_schedule_rport_del(struct scsi_qla_host *vha, fc_port_t *fcport,
int defer)
Expand Down

0 comments on commit 8867048

Please sign in to comment.