diff for duplicates of <20171025100145.GA144703@beast> diff --git a/a/1.txt b/N1/1.txt index 3bd8bdb..576f96d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -43,8 +43,7 @@ index 7fe2aa73cff6..4c9db2525d01 100644 - init_timer(&sess->time2retain_timer); + timer_setup(&sess->time2retain_timer, + iscsit_handle_time2retain_timeout, 0); - sess->time2retain_timer.expires = - (get_jiffies_64() + sess->sess_ops->DefaultTime2Retain * HZ); + sess->time2retain_timer.expires (get_jiffies_64() + sess->sess_ops->DefaultTime2Retain * HZ); - sess->time2retain_timer.data = (unsigned long)sess; - sess->time2retain_timer.function = iscsit_handle_time2retain_timeout; sess->time2retain_timer_flags &= ~ISCSI_TF_STOP; @@ -183,8 +182,7 @@ index 1e36f83b5961..32aa06cf9a27 100644 - init_timer(&conn->nopin_response_timer); + timer_setup(&conn->nopin_response_timer, + iscsit_handle_nopin_response_timeout, 0); - conn->nopin_response_timer.expires = - (get_jiffies_64() + na->nopin_response_timeout * HZ); + conn->nopin_response_timer.expires (get_jiffies_64() + na->nopin_response_timeout * HZ); - conn->nopin_response_timer.data = (unsigned long)conn; - conn->nopin_response_timer.function = iscsit_handle_nopin_response_timeout; conn->nopin_response_timer_flags &= ~ISCSI_TF_STOP; diff --git a/a/content_digest b/N1/content_digest index a604cfd..6c9ce95 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Kees Cook <keescook@chromium.org>\0" "Subject\0[PATCH] iscsi-target: Convert timers to use timer_setup()\0" - "Date\0Wed, 25 Oct 2017 03:01:45 -0700\0" + "Date\0Wed, 25 Oct 2017 10:01:45 +0000\0" "To\0Nicholas Bellinger <nab@linux-iscsi.org>\0" "Cc\0Jiang Yi <jiangyilism@gmail.com>" Varun Prakash <varun@chelsio.com> @@ -57,8 +57,7 @@ "-\tinit_timer(&sess->time2retain_timer);\n" "+\ttimer_setup(&sess->time2retain_timer,\n" "+\t\t iscsit_handle_time2retain_timeout, 0);\n" - " \tsess->time2retain_timer.expires =\n" - " \t\t(get_jiffies_64() + sess->sess_ops->DefaultTime2Retain * HZ);\n" + " \tsess->time2retain_timer.expires \t\t(get_jiffies_64() + sess->sess_ops->DefaultTime2Retain * HZ);\n" "-\tsess->time2retain_timer.data = (unsigned long)sess;\n" "-\tsess->time2retain_timer.function = iscsit_handle_time2retain_timeout;\n" " \tsess->time2retain_timer_flags &= ~ISCSI_TF_STOP;\n" @@ -197,8 +196,7 @@ "-\tinit_timer(&conn->nopin_response_timer);\n" "+\ttimer_setup(&conn->nopin_response_timer,\n" "+\t\t iscsit_handle_nopin_response_timeout, 0);\n" - " \tconn->nopin_response_timer.expires =\n" - " \t\t(get_jiffies_64() + na->nopin_response_timeout * HZ);\n" + " \tconn->nopin_response_timer.expires \t\t(get_jiffies_64() + na->nopin_response_timeout * HZ);\n" "-\tconn->nopin_response_timer.data = (unsigned long)conn;\n" "-\tconn->nopin_response_timer.function = iscsit_handle_nopin_response_timeout;\n" " \tconn->nopin_response_timer_flags &= ~ISCSI_TF_STOP;\n" @@ -248,4 +246,4 @@ "Kees Cook\n" Pixel Security -89149de7227828bf3c7c51414e618a0aca0d652595993b4083c7cac07e5efadb +1ae6684b7923896eb49b9147e60b2d66f49486cf6fb47a55070437d2d87a83ff
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.