diff options
author | Kees Cook <keescook@chromium.org> | 2017-10-22 14:58:45 -0700 |
---|---|---|
committer | Kees Cook <keescook@chromium.org> | 2017-11-01 11:44:50 -0700 |
commit | f7c9564a7cfa3ff69be74bcb1867c898772748b6 (patch) | |
tree | 0a78ebea3f176e5a0c2e7548545352c849772edd /drivers/target/iscsi/iscsi_target_erl0.h | |
parent | 8a47aa9dc636db851254615ea79ba91a52cf9206 (diff) | |
download | kernel_replicant_linux-f7c9564a7cfa3ff69be74bcb1867c898772748b6.tar.gz kernel_replicant_linux-f7c9564a7cfa3ff69be74bcb1867c898772748b6.tar.bz2 kernel_replicant_linux-f7c9564a7cfa3ff69be74bcb1867c898772748b6.zip |
target/iscsi: 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. Includes a fix for correcting an
on-stack timer usage.
Cc: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
Cc: Bart Van Assche <bart.vanassche@sandisk.com>
Cc: Jiang Yi <jiangyilism@gmail.com>
Cc: Varun Prakash <varun@chelsio.com>
Cc: linux-scsi@vger.kernel.org
Cc: target-devel@vger.kernel.org
Reviewed-and-Tested-by: Bart Van Assche <Bart.VanAssche@wdc.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'drivers/target/iscsi/iscsi_target_erl0.h')
-rw-r--r-- | drivers/target/iscsi/iscsi_target_erl0.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/target/iscsi/iscsi_target_erl0.h b/drivers/target/iscsi/iscsi_target_erl0.h index 97e4ae728926..dba5e7826574 100644 --- a/drivers/target/iscsi/iscsi_target_erl0.h +++ b/drivers/target/iscsi/iscsi_target_erl0.h @@ -11,7 +11,7 @@ extern void iscsit_set_dataout_sequence_values(struct iscsi_cmd *); extern int iscsit_check_pre_dataout(struct iscsi_cmd *, unsigned char *); extern int iscsit_check_post_dataout(struct iscsi_cmd *, unsigned char *, u8); extern void iscsit_start_time2retain_handler(struct iscsi_session *); -extern void iscsit_handle_time2retain_timeout(unsigned long data); +extern void iscsit_handle_time2retain_timeout(struct timer_list *t); extern int iscsit_stop_time2retain_timer(struct iscsi_session *); extern void iscsit_connection_reinstatement_rcfr(struct iscsi_conn *); extern void iscsit_cause_connection_reinstatement(struct iscsi_conn *, int); |