UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi: fcoe: Convert timers to use timer_setup() 

In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: QLogic-Storage-Upstream@qlogic.com
Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Johannes Thumshirn <jth@kernel.org>
Cc: linux-scsi@vger.kernel.org
Cc: fcoe-devel@open-fcoe.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Johannes Thumshirn <jth@kernel.org>
This commit is contained in:
Kees Cook 2017-09-21 13:12:15 -07:00
parent af53b89bec
commit 1305910624
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/scsi/bnx2fc/bnx2fc_fcoe.c
View File

@ -823,7 +823,7 @@ static int bnx2fc_net_config(struct fc_lport *lport, struct net_device *netdev)
skb_queue_head_init(&port->fcoe_pending_queue); skb_queue_head_init(&port->fcoe_pending_queue);
port->fcoe_pending_queue_active = 0; port->fcoe_pending_queue_active = 0;
setup_timer(&port->timer, fcoe_queue_timer, (unsigned long) lport); timer_setup(&port->timer, fcoe_queue_timer, 0);
fcoe_link_speed_update(lport); fcoe_link_speed_update(lport);
@ -845,9 +845,9 @@ static int bnx2fc_net_config(struct fc_lport *lport, struct net_device *netdev)
return 0; return 0;
} }
static void bnx2fc_destroy_timer(unsigned long data) static void bnx2fc_destroy_timer(struct timer_list *t)
{ {
struct bnx2fc_hba *hba = (struct bnx2fc_hba *)data; struct bnx2fc_hba *hba = from_timer(hba, t, destroy_timer);
printk(KERN_ERR PFX "ERROR:bnx2fc_destroy_timer - " printk(KERN_ERR PFX "ERROR:bnx2fc_destroy_timer - "
"Destroy compl not received!!\n"); "Destroy compl not received!!\n");
@ -1946,11 +1946,10 @@ static void bnx2fc_fw_destroy(struct bnx2fc_hba *hba)
{ {
if (test_and_clear_bit(BNX2FC_FLAG_FW_INIT_DONE, &hba->flags)) { if (test_and_clear_bit(BNX2FC_FLAG_FW_INIT_DONE, &hba->flags)) {
if (bnx2fc_send_fw_fcoe_destroy_msg(hba) == 0) { if (bnx2fc_send_fw_fcoe_destroy_msg(hba) == 0) {
init_timer(&hba->destroy_timer); timer_setup(&hba->destroy_timer, bnx2fc_destroy_timer,
0);
hba->destroy_timer.expires = BNX2FC_FW_TIMEOUT + hba->destroy_timer.expires = BNX2FC_FW_TIMEOUT +
jiffies; jiffies;
hba->destroy_timer.function = bnx2fc_destroy_timer;
hba->destroy_timer.data = (unsigned long)hba;
add_timer(&hba->destroy_timer); add_timer(&hba->destroy_timer);
wait_event_interruptible(hba->destroy_wait, wait_event_interruptible(hba->destroy_wait,
test_bit(BNX2FC_FLAG_DESTROY_CMPL, test_bit(BNX2FC_FLAG_DESTROY_CMPL,

2
drivers/scsi/fcoe/fcoe.c
View File

@ -754,7 +754,7 @@ static int fcoe_netdev_config(struct fc_lport *lport, struct net_device *netdev)
skb_queue_head_init(&port->fcoe_pending_queue); skb_queue_head_init(&port->fcoe_pending_queue);
port->fcoe_pending_queue_active = 0; port->fcoe_pending_queue_active = 0;
setup_timer(&port->timer, fcoe_queue_timer, (unsigned long)lport); timer_setup(&port->timer, fcoe_queue_timer, 0);
fcoe_link_speed_update(lport); fcoe_link_speed_update(lport);

6
drivers/scsi/fcoe/fcoe_transport.c
View File

@ -455,9 +455,11 @@ EXPORT_SYMBOL_GPL(fcoe_check_wait_queue);
* *
* Calls fcoe_check_wait_queue on timeout * Calls fcoe_check_wait_queue on timeout
*/ */
void fcoe_queue_timer(ulong lport) void fcoe_queue_timer(struct timer_list *t)
{ {
fcoe_check_wait_queue((struct fc_lport *)lport, NULL); struct fcoe_port *port = from_timer(port, t, timer);
fcoe_check_wait_queue(port->lport, NULL);
} }
EXPORT_SYMBOL_GPL(fcoe_queue_timer); EXPORT_SYMBOL_GPL(fcoe_queue_timer);

2
include/scsi/libfcoe.h
View File

@ -382,7 +382,7 @@ static inline struct net_device *fcoe_get_netdev(const struct fc_lport *lport)
void fcoe_clean_pending_queue(struct fc_lport *); void fcoe_clean_pending_queue(struct fc_lport *);
void fcoe_check_wait_queue(struct fc_lport *lport, struct sk_buff *skb); void fcoe_check_wait_queue(struct fc_lport *lport, struct sk_buff *skb);
void fcoe_queue_timer(ulong lport); void fcoe_queue_timer(struct timer_list *t);
int fcoe_get_paged_crc_eof(struct sk_buff *skb, int tlen, int fcoe_get_paged_crc_eof(struct sk_buff *skb, int tlen,
struct fcoe_percpu_s *fps); struct fcoe_percpu_s *fps);