From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757159AbXLKWrP (ORCPT ); Tue, 11 Dec 2007 17:47:15 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754757AbXLKWq4 (ORCPT ); Tue, 11 Dec 2007 17:46:56 -0500 Received: from mx1.redhat.com ([66.187.233.31]:39112 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753751AbXLKWqy (ORCPT ); Tue, 11 Dec 2007 17:46:54 -0500 Date: Tue, 11 Dec 2007 17:46:47 -0500 (EST) Message-Id: <20071211.174647.75757994.k-ueda@ct.jp.nec.com> To: jens.axboe@oracle.com Cc: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org, dm-devel@redhat.com, j-nomura@ce.jp.nec.com, k-ueda@ct.jp.nec.com, zaitcev@redhat.com Subject: [PATCH 12/30] blk_end_request: changing ub (take 4) From: Kiyoshi Ueda X-Mailer: Mew version 4.2 on Emacs 21.4 / Mule 5.0 =?iso-2022-jp?B?KBskQjgtTFobKEIp?= Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch converts ub to use blk_end_request interfaces. Related 'uptodate' arguments are converted to 'error'. Cc: Pete Zaitcev Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura --- drivers/block/ub.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) Index: 2.6.24-rc4/drivers/block/ub.c =================================================================== --- 2.6.24-rc4.orig/drivers/block/ub.c +++ 2.6.24-rc4/drivers/block/ub.c @@ -808,16 +808,16 @@ static void ub_rw_cmd_done(struct ub_dev static void ub_end_rq(struct request *rq, unsigned int scsi_status) { - int uptodate; + int error; if (scsi_status == 0) { - uptodate = 1; + error = 0; } else { - uptodate = 0; + error = -EIO; rq->errors = scsi_status; } - end_that_request_first(rq, uptodate, rq->hard_nr_sectors); - end_that_request_last(rq, uptodate); + if (__blk_end_request(rq, error, blk_rq_bytes(rq))) + BUG(); } static int ub_rw_cmd_retry(struct ub_dev *sc, struct ub_lun *lun,