From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262649AbVENOFv (ORCPT ); Sat, 14 May 2005 10:05:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262640AbVENODk (ORCPT ); Sat, 14 May 2005 10:03:40 -0400 Received: from wproxy.gmail.com ([64.233.184.205]:24787 "EHLO wproxy.gmail.com") by vger.kernel.org with ESMTP id S262765AbVENN56 (ORCPT ); Sat, 14 May 2005 09:57:58 -0400 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:from:to:cc:user-agent:content-type:references:in-reply-to:subject:message-id:date; b=cX0SiXsDL16r6APre0MhIKvK4NPx4D1ETbBcgP+vdqlOBODq7gcg6ALYnqRRvt+Gxpc8VAfy43WOx20t4BC4NBWG8uJnkoTVg9bBky5MaL0nJGtt3TPEgMfgbHBnwrwbZGJv7c+8wgk7UqtI9LqBse3aMj4zh7X0UGo4V0/Ab2c= From: Tejun Heo To: James.Bottomley@steeleye.com, axboe@suse.de, Christoph Hellwig Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org User-Agent: lksp 0.3 Content-Type: text/plain; charset=US-ASCII References: <20050514135610.81030F26@htj.dyndns.org> In-Reply-To: <20050514135610.81030F26@htj.dyndns.org> Subject: Re: [PATCH scsi-misc-2.6 04/04] scsi: remove unnecessary scsi_wait_req_end_io() Message-ID: <20050514135610.50606F9C@htj.dyndns.org> Date: Sat, 14 May 2005 22:57:54 +0900 (KST) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Tejun Heo 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-05-14 22:35:19.000000000 +0900 +++ scsi-reqfn-export/drivers/scsi/scsi_lib.c 2005-05-14 22:35:19.000000000 +0900 @@ -265,16 +265,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) { @@ -282,7 +272,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);