Message ID | 20170523234854.21452-17-bart.vanassche@sandisk.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 24/05/17 01:48, Bart Van Assche wrote: > This patch simplifies the implementation of the scsiback driver > but does not change its behavior. > > Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> > Cc: Juergen Gross <jgross@suse.com> > Cc: Christoph Hellwig <hch@lst.de> > Cc: Hannes Reinecke <hare@suse.com> > Cc: David Disseldorp <ddiss@suse.de> > Cc: xen-devel@lists.xenproject.org Reviewed-by: Juergen Gross <jgross@suse.com> Juergen -- 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
On Tue, 2017-05-23 at 16:48 -0700, Bart Van Assche wrote: > This patch simplifies the implementation of the scsiback driver > but does not change its behavior. > > Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> > Cc: Juergen Gross <jgross@suse.com> > Cc: Christoph Hellwig <hch@lst.de> > Cc: Hannes Reinecke <hare@suse.com> > Cc: David Disseldorp <ddiss@suse.de> > Cc: xen-devel@lists.xenproject.org > --- > drivers/xen/xen-scsiback.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) Applied. -- 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/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c index 980f32817305..4cb33a0916a8 100644 --- a/drivers/xen/xen-scsiback.c +++ b/drivers/xen/xen-scsiback.c @@ -135,8 +135,7 @@ struct vscsibk_pend { struct se_cmd se_cmd; - atomic_t tmr_complete; - wait_queue_head_t tmr_wait; + struct completion tmr_done; }; #define VSCSI_DEFAULT_SESSION_TAGS 128 @@ -600,7 +599,7 @@ static void scsiback_device_action(struct vscsibk_pend *pending_req, u64 unpacked_lun = pending_req->v2p->lun; int rc, err = FAILED; - init_waitqueue_head(&pending_req->tmr_wait); + init_completion(&pending_req->tmr_done); rc = target_submit_tmr(&pending_req->se_cmd, nexus->tvn_se_sess, &pending_req->sense_buffer[0], @@ -609,8 +608,7 @@ static void scsiback_device_action(struct vscsibk_pend *pending_req, if (rc) goto err; - wait_event(pending_req->tmr_wait, - atomic_read(&pending_req->tmr_complete)); + wait_for_completion(&pending_req->tmr_done); err = (se_cmd->se_tmr_req->response == TMR_FUNCTION_COMPLETE) ? SUCCESS : FAILED; @@ -1443,8 +1441,7 @@ static void scsiback_queue_tm_rsp(struct se_cmd *se_cmd) struct vscsibk_pend *pending_req = container_of(se_cmd, struct vscsibk_pend, se_cmd); - atomic_set(&pending_req->tmr_complete, 1); - wake_up(&pending_req->tmr_wait); + complete(&pending_req->tmr_done); } static void scsiback_aborted_task(struct se_cmd *se_cmd)
This patch simplifies the implementation of the scsiback driver but does not change its behavior. Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> Cc: Juergen Gross <jgross@suse.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Hannes Reinecke <hare@suse.com> Cc: David Disseldorp <ddiss@suse.de> Cc: xen-devel@lists.xenproject.org --- drivers/xen/xen-scsiback.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)