Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965715AbXIKTI0 (ORCPT ); Tue, 11 Sep 2007 15:08:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S965147AbXIKTDW (ORCPT ); Tue, 11 Sep 2007 15:03:22 -0400 Received: from mx1.redhat.com ([66.187.233.31]:47728 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965123AbXIKTDU (ORCPT ); Tue, 11 Sep 2007 15:03:20 -0400 Date: Tue, 11 Sep 2007 15:02:49 -0400 (EDT) Message-Id: <20070911.150249.78157677.k-ueda@ct.jp.nec.com> To: jens.axboe@oracle.com, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org, mike.miller@hp.com, grant.likely@secretlab.ca Cc: dm-devel@redhat.com, j-nomura@ce.jp.nec.com, k-ueda@ct.jp.nec.com Subject: [PATCH 19/27] blk_end_request: changing s390 (take 2) From: Kiyoshi Ueda X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1814 Lines: 43 This patch converts s390 to use blk_end_request(). Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura --- drivers/s390/block/dasd.c | 4 +--- drivers/s390/char/tape_block.c | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff -rupN 18-mmc-caller-change/drivers/s390/block/dasd.c 19-s390-caller-change/drivers/s390/block/dasd.c --- 18-mmc-caller-change/drivers/s390/block/dasd.c 2007-08-27 21:32:35.000000000 -0400 +++ 19-s390-caller-change/drivers/s390/block/dasd.c 2007-09-10 18:09:25.000000000 -0400 @@ -1080,10 +1080,8 @@ dasd_int_handler(struct ccw_device *cdev static inline void dasd_end_request(struct request *req, int uptodate) { - if (end_that_request_first(req, uptodate, req->hard_nr_sectors)) + if (__blk_end_request(req, uptodate, blk_rq_size(req))) BUG(); - add_disk_randomness(req->rq_disk); - end_that_request_last(req, uptodate); } /* diff -rupN 18-mmc-caller-change/drivers/s390/char/tape_block.c 19-s390-caller-change/drivers/s390/char/tape_block.c --- 18-mmc-caller-change/drivers/s390/char/tape_block.c 2007-08-27 21:32:35.000000000 -0400 +++ 19-s390-caller-change/drivers/s390/char/tape_block.c 2007-09-10 18:09:25.000000000 -0400 @@ -76,9 +76,8 @@ tapeblock_trigger_requeue(struct tape_de static void tapeblock_end_request(struct request *req, int uptodate) { - if (end_that_request_first(req, uptodate, req->hard_nr_sectors)) + if (__blk_end_request(req, uptodate, blk_rq_size(req))) BUG(); - end_that_request_last(req, uptodate); } static void - 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/