hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[SCSI] libfcoe: fcoe_ctlr_destroy use cancel_work_sync instead of flush_work 

Use cancel_work_sync() in place of flush_work(), so that
fcoe_ctlr_destroy() can be called from a workqueue.

Also, purge the receive queue after the recv_work has been cancled because
if recv_work isn't run it's not guaranteed to be empty now.

Signed-off-by: Chris Leech <christopher.leech@intel.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Chris Leech 2009-08-25 13:59:08 -07:00 committed by James Bottomley
parent 05cc739073
commit a4b7cfaee4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/scsi/fcoe/libfcoe.c
View File

@ -148,13 +148,17 @@ static void fcoe_ctlr_reset_fcfs(struct fcoe_ctlr *fip)
*/ */
void fcoe_ctlr_destroy(struct fcoe_ctlr *fip) void fcoe_ctlr_destroy(struct fcoe_ctlr *fip)
{ {
flush_work(&fip->recv_work); cancel_work_sync(&fip->recv_work);
spin_lock_bh(&fip->fip_recv_list.lock);
__skb_queue_purge(&fip->fip_recv_list);
spin_unlock_bh(&fip->fip_recv_list.lock);
spin_lock_bh(&fip->lock); spin_lock_bh(&fip->lock);
fip->state = FIP_ST_DISABLED; fip->state = FIP_ST_DISABLED;
fcoe_ctlr_reset_fcfs(fip); fcoe_ctlr_reset_fcfs(fip);
spin_unlock_bh(&fip->lock); spin_unlock_bh(&fip->lock);
del_timer_sync(&fip->timer); del_timer_sync(&fip->timer);
flush_work(&fip->link_work); cancel_work_sync(&fip->link_work);
} }
EXPORT_SYMBOL(fcoe_ctlr_destroy); EXPORT_SYMBOL(fcoe_ctlr_destroy);