| Message ID | 20170208222507.25715-31-bart.vanassche@sandisk.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Wed, 2017-02-08 at 14:25 -0800, Bart Van Assche wrote: > Remove the arguments that are no longer needed due to the previous > patch. > > Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> > Reviewed-by: Hannes Reinecke <hare@suse.com> > Cc: Christoph Hellwig <hch@lst.de> > Cc: Andy Grover <agrover@redhat.com> > Cc: David Disseldorp <ddiss@suse.de> > --- > drivers/target/target_core_tmr.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c > index 635d1704e676..c05e99a01815 100644 > --- a/drivers/target/target_core_tmr.c > +++ b/drivers/target/target_core_tmr.c > @@ -90,8 +90,7 @@ static int target_check_cdb_and_preempt(struct list_head *list, > return 1; > } > > -static bool __target_check_io_state(struct se_cmd *se_cmd, > - struct se_session *tmr_sess, int tas) > +static bool __target_check_io_state(struct se_cmd *se_cmd) > { > struct se_session *sess = se_cmd->se_sess; > > @@ -152,7 +151,7 @@ void core_tmr_abort_task( > printk("ABORT_TASK: Found referenced %s task_tag: %llu\n", > se_cmd->se_tfo->get_fabric_name(), ref_tag); > > - if (!__target_check_io_state(se_cmd, se_sess, 0)) > + if (!__target_check_io_state(se_cmd)) > continue; > > if (!tmr->tmr_dev && > @@ -223,7 +222,7 @@ static void core_tmr_drain_tmr_list( > continue; > > spin_lock(&sess->sess_cmd_lock); > - rc = __target_check_io_state(cmd, sess, 0); > + rc = __target_check_io_state(cmd); > spin_unlock(&sess->sess_cmd_lock); > > if (!rc) { > @@ -324,7 +323,7 @@ static void core_tmr_drain_state_list( > continue; > > spin_lock(&sess->sess_cmd_lock); > - rc = __target_check_io_state(cmd, tmr_sess, tas); > + rc = __target_check_io_state(cmd); > spin_unlock(&sess->sess_cmd_lock); > if (!rc) > continue; Still both required for second order issue handling described at the top of patch #18. Dropping for now. -- To unsubscribe from this list: send the line "unsubscribe target-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c index 635d1704e676..c05e99a01815 100644 --- a/drivers/target/target_core_tmr.c +++ b/drivers/target/target_core_tmr.c @@ -90,8 +90,7 @@ static int target_check_cdb_and_preempt(struct list_head *list, return 1; } -static bool __target_check_io_state(struct se_cmd *se_cmd, - struct se_session *tmr_sess, int tas) +static bool __target_check_io_state(struct se_cmd *se_cmd) { struct se_session *sess = se_cmd->se_sess; @@ -152,7 +151,7 @@ void core_tmr_abort_task( printk("ABORT_TASK: Found referenced %s task_tag: %llu\n", se_cmd->se_tfo->get_fabric_name(), ref_tag); - if (!__target_check_io_state(se_cmd, se_sess, 0)) + if (!__target_check_io_state(se_cmd)) continue; if (!tmr->tmr_dev && @@ -223,7 +222,7 @@ static void core_tmr_drain_tmr_list( continue; spin_lock(&sess->sess_cmd_lock); - rc = __target_check_io_state(cmd, sess, 0); + rc = __target_check_io_state(cmd); spin_unlock(&sess->sess_cmd_lock); if (!rc) { @@ -324,7 +323,7 @@ static void core_tmr_drain_state_list( continue; spin_lock(&sess->sess_cmd_lock); - rc = __target_check_io_state(cmd, tmr_sess, tas); + rc = __target_check_io_state(cmd); spin_unlock(&sess->sess_cmd_lock); if (!rc) continue;