Re: [PATCH scsi-misc-2.6 04/04] scsi: remove unnecessary scsi_wait_req_end_io()

• Previous message: akpm_at_osdl.org: "[patch 165/198] IB/mthca: fix calculation of RDB shift"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

To: James.Bottomley@steeleye.com, axboe@suse.de, Christoph Hellwig <hch@infradead.org>
Date:	Tue, 12 Apr 2005 19:33:08 +0900 (KST)

04_scsi_reqfn_remove_wait_req_end_io.patch

        As all requests are now terminated via scsi midlayer, we don't
        need to set end_io for special reqs, remove it.

        Note that scsi_kill_requests() still terminates requests using
        blk layer. The path is circular-ref workaround and soon to be
        replaced, so ignore it for now.

Signed-off-by: Tejun Heo <htejun@gmail.com>

 scsi_lib.c | 11 -----------
 1 files changed, 11 deletions(-)

Index: scsi-reqfn-export/drivers/scsi/scsi_lib.c
===================================================================
--- scsi-reqfn-export.orig/drivers/scsi/scsi_lib.c 2005-04-12 19:27:55.000000000 +0900
+++ scsi-reqfn-export/drivers/scsi/scsi_lib.c 2005-04-12 19:27:56.000000000 +0900
@@ -260,16 +260,6 @@ static void scsi_wait_done(struct scsi_c
                 complete(req->waiting);
 }
 
-/* This is the end routine we get to if a command was never attached
- * to the request. Simply complete the request without changing
- * rq_status; this will cause a DRIVER_ERROR. */
-static void scsi_wait_req_end_io(struct request *req)
-{
- BUG_ON(!req->waiting);
-
- complete(req->waiting);
-}
-
 void scsi_wait_req(struct scsi_request *sreq, const void *cmnd, void *buffer,
                    unsigned bufflen, int timeout, int retries)
 {
@@ -277,7 +267,6 @@ void scsi_wait_req(struct scsi_request *
         
         sreq->sr_request->waiting = &wait;
         sreq->sr_request->rq_status = RQ_SCSI_BUSY;
- sreq->sr_request->end_io = scsi_wait_req_end_io;
         scsi_do_req(sreq, cmnd, buffer, bufflen, scsi_wait_done,
                         timeout, retries);
         wait_for_completion(&wait);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

• Previous message: akpm_at_osdl.org: "[patch 165/198] IB/mthca: fix calculation of RDB shift"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]