Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 316764
b: refs/heads/master
c: d71fb3b
h: refs/heads/master
v: v3
  • Loading branch information
Bhanu Prakash Gollapudi authored and James Bottomley committed Jul 20, 2012
1 parent 7635d28 commit f31ab04
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 29 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5c17ae217ad13463f821c3bab774335777da9c33
refs/heads/master: d71fb3bdeee80565eda4d3453ff6d9f6f8176745
5 changes: 1 addition & 4 deletions trunk/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2151,13 +2151,10 @@ static int bnx2fc_create(struct net_device *netdev, enum fip_state fip_mode)
**/
static struct bnx2fc_hba *bnx2fc_find_hba_for_cnic(struct cnic_dev *cnic)
{
struct list_head *list;
struct list_head *temp;
struct bnx2fc_hba *hba;

/* Called with bnx2fc_dev_lock held */
list_for_each_safe(list, temp, &adapter_list) {
hba = (struct bnx2fc_hba *)list;
list_for_each_entry(hba, &adapter_list, list) {
if (hba->cnic == cnic)
return hba;
}
Expand Down
21 changes: 7 additions & 14 deletions trunk/drivers/scsi/bnx2fc/bnx2fc_io.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -405,11 +405,10 @@ void bnx2fc_cmd_mgr_free(struct bnx2fc_cmd_mgr *cmgr)
goto free_cmgr;

for (i = 0; i < num_possible_cpus() + 1; i++) {
struct list_head *list;
struct list_head *tmp;
struct bnx2fc_cmd *tmp, *io_req;

list_for_each_safe(list, tmp, &cmgr->free_list[i]) {
struct bnx2fc_cmd *io_req = (struct bnx2fc_cmd *)list;
list_for_each_entry_safe(io_req, tmp,
&cmgr->free_list[i], link) {
list_del(&io_req->link);
kfree(io_req);
}
Expand Down Expand Up @@ -1436,9 +1435,7 @@ static void bnx2fc_lun_reset_cmpl(struct bnx2fc_cmd *io_req)
{
struct scsi_cmnd *sc_cmd = io_req->sc_cmd;
struct bnx2fc_rport *tgt = io_req->tgt;
struct list_head *list;
struct list_head *tmp;
struct bnx2fc_cmd *cmd;
struct bnx2fc_cmd *cmd, *tmp;
int tm_lun = sc_cmd->device->lun;
int rc = 0;
int lun;
Expand All @@ -1449,9 +1446,8 @@ static void bnx2fc_lun_reset_cmpl(struct bnx2fc_cmd *io_req)
* Walk thru the active_ios queue and ABORT the IO
* that matches with the LUN that was reset
*/
list_for_each_safe(list, tmp, &tgt->active_cmd_queue) {
list_for_each_entry_safe(cmd, tmp, &tgt->active_cmd_queue, link) {
BNX2FC_TGT_DBG(tgt, "LUN RST cmpl: scan for pending IOs\n");
cmd = (struct bnx2fc_cmd *)list;
lun = cmd->sc_cmd->device->lun;
if (lun == tm_lun) {
/* Initiate ABTS on this cmd */
Expand All @@ -1476,9 +1472,7 @@ static void bnx2fc_lun_reset_cmpl(struct bnx2fc_cmd *io_req)
static void bnx2fc_tgt_reset_cmpl(struct bnx2fc_cmd *io_req)
{
struct bnx2fc_rport *tgt = io_req->tgt;
struct list_head *list;
struct list_head *tmp;
struct bnx2fc_cmd *cmd;
struct bnx2fc_cmd *cmd, *tmp;
int rc = 0;

/* called with tgt_lock held */
Expand All @@ -1487,9 +1481,8 @@ static void bnx2fc_tgt_reset_cmpl(struct bnx2fc_cmd *io_req)
* Walk thru the active_ios queue and ABORT the IO
* that matches with the LUN that was reset
*/
list_for_each_safe(list, tmp, &tgt->active_cmd_queue) {
list_for_each_entry_safe(cmd, tmp, &tgt->active_cmd_queue, link) {
BNX2FC_TGT_DBG(tgt, "TGT RST cmpl: scan for pending IOs\n");
cmd = (struct bnx2fc_cmd *)list;
/* Initiate ABTS */
if (!test_and_set_bit(BNX2FC_FLAG_ISSUE_ABTS,
&cmd->req_flags)) {
Expand Down
15 changes: 5 additions & 10 deletions trunk/drivers/scsi/bnx2fc/bnx2fc_tgt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,7 @@ static void bnx2fc_offload_session(struct fcoe_port *port,
void bnx2fc_flush_active_ios(struct bnx2fc_rport *tgt)
{
struct bnx2fc_cmd *io_req;
struct list_head *list;
struct list_head *tmp;
struct bnx2fc_cmd *tmp;
int rc;
int i = 0;
BNX2FC_TGT_DBG(tgt, "Entered flush_active_ios - %d\n",
Expand All @@ -160,9 +159,8 @@ void bnx2fc_flush_active_ios(struct bnx2fc_rport *tgt)
spin_lock_bh(&tgt->tgt_lock);
tgt->flush_in_prog = 1;

list_for_each_safe(list, tmp, &tgt->active_cmd_queue) {
list_for_each_entry_safe(io_req, tmp, &tgt->active_cmd_queue, link) {
i++;
io_req = (struct bnx2fc_cmd *)list;
list_del_init(&io_req->link);
io_req->on_active_queue = 0;
BNX2FC_IO_DBG(io_req, "cmd_queue cleanup\n");
Expand Down Expand Up @@ -191,19 +189,17 @@ void bnx2fc_flush_active_ios(struct bnx2fc_rport *tgt)
}
}

list_for_each_safe(list, tmp, &tgt->active_tm_queue) {
list_for_each_entry_safe(io_req, tmp, &tgt->active_tm_queue, link) {
i++;
io_req = (struct bnx2fc_cmd *)list;
list_del_init(&io_req->link);
io_req->on_tmf_queue = 0;
BNX2FC_IO_DBG(io_req, "tm_queue cleanup\n");
if (io_req->wait_for_comp)
complete(&io_req->tm_done);
}

list_for_each_safe(list, tmp, &tgt->els_queue) {
list_for_each_entry_safe(io_req, tmp, &tgt->els_queue, link) {
i++;
io_req = (struct bnx2fc_cmd *)list;
list_del_init(&io_req->link);
io_req->on_active_queue = 0;

Expand All @@ -227,9 +223,8 @@ void bnx2fc_flush_active_ios(struct bnx2fc_rport *tgt)
}
}

list_for_each_safe(list, tmp, &tgt->io_retire_queue) {
list_for_each_entry_safe(io_req, tmp, &tgt->io_retire_queue, link) {
i++;
io_req = (struct bnx2fc_cmd *)list;
list_del_init(&io_req->link);

BNX2FC_IO_DBG(io_req, "retire_queue flush\n");
Expand Down

0 comments on commit f31ab04

Please sign in to comment.