diff options
| author | Neil Horman <nhorman@tuxdriver.com> | 2012-03-09 14:50:19 -0800 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-03-28 09:17:01 +0100 |
| commit | dd060e74fb4c2513420d8af7371cda2f3eea4fa9 (patch) | |
| tree | e5d66bec0ea7f4de3eb708d1452ba2da10776ac4 /drivers | |
| parent | fc05ab74b78a9e16b0faa9f0dc3c87f3f30d3231 (diff) | |
| download | linux-stable-dd060e74fb4c2513420d8af7371cda2f3eea4fa9.tar.gz linux-stable-dd060e74fb4c2513420d8af7371cda2f3eea4fa9.tar.bz2 linux-stable-dd060e74fb4c2513420d8af7371cda2f3eea4fa9.zip | |
[SCSI] fcoe: remove frame dropping code from fcoe_percpu_clean
commit e7a51997dad4e17395be1209970e18d2e9305b24 ([SCSI] fcoe: flush per-cpu
thread work when destroying interface) added a skb flush to the fcoe_rx_list,
which ensures that we push any pending frames on the list through the per-cpu
receive thread. Because of this, its redundant to lock and scan the list
first, dropping any arriving frames.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: Vasu Dev <vasu.dev@intel.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/fcoe/fcoe.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index 961bf364429a..d86ca37b3787 100644 --- a/drivers/scsi/fcoe/fcoe.c +++ b/drivers/scsi/fcoe/fcoe.c @@ -2254,31 +2254,14 @@ static int fcoe_link_ok(struct fc_lport *lport) static void fcoe_percpu_clean(struct fc_lport *lport) { struct fcoe_percpu_s *pp; - struct fcoe_rcv_info *fr; - struct sk_buff_head *list; - struct sk_buff *skb, *next; - struct sk_buff *head; + struct sk_buff *skb; unsigned int cpu; for_each_possible_cpu(cpu) { pp = &per_cpu(fcoe_percpu, cpu); - spin_lock_bh(&pp->fcoe_rx_list.lock); - list = &pp->fcoe_rx_list; - head = list->next; - for (skb = head; skb != (struct sk_buff *)list; - skb = next) { - next = skb->next; - fr = fcoe_dev_from_skb(skb); - if (fr->fr_dev == lport) { - __skb_unlink(skb, list); - kfree_skb(skb); - } - } - if (!pp->thread || !cpu_online(cpu)) { - spin_unlock_bh(&pp->fcoe_rx_list.lock); + if (!pp->thread || !cpu_online(cpu)) continue; - } skb = dev_alloc_skb(0); if (!skb) { @@ -2287,6 +2270,7 @@ static void fcoe_percpu_clean(struct fc_lport *lport) } skb->destructor = fcoe_percpu_flush_done; + spin_lock_bh(&pp->fcoe_rx_list.lock); __skb_queue_tail(&pp->fcoe_rx_list, skb); if (pp->fcoe_rx_list.qlen == 1) wake_up_process(pp->thread); |