Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760419AbXK3X1m (ORCPT ); Fri, 30 Nov 2007 18:27:42 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760181AbXK3X1a (ORCPT ); Fri, 30 Nov 2007 18:27:30 -0500 Received: from mx1.redhat.com ([66.187.233.31]:43739 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757461AbXK3X12 (ORCPT ); Fri, 30 Nov 2007 18:27:28 -0500 Date: Fri, 30 Nov 2007 18:27:08 -0500 (EST) Message-Id: <20071130.182708.45746495.k-ueda@ct.jp.nec.com> To: jens.axboe@oracle.com, bharrosh@panasas.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 Subject: [PATCH 06/28] blk_end_request: changing DAC960 (take 3) 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 X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1218 Lines: 29 This patch converts DAC960 to use blk_end_request(). Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura --- drivers/block/DAC960.c | 5 +---- 1 files changed, 1 insertion(+), 4 deletions(-) Index: 2.6.24-rc3-mm2/drivers/block/DAC960.c =================================================================== --- 2.6.24-rc3-mm2.orig/drivers/block/DAC960.c +++ 2.6.24-rc3-mm2/drivers/block/DAC960.c @@ -3464,10 +3464,7 @@ static inline bool DAC960_ProcessComplet pci_unmap_sg(Command->Controller->PCIDevice, Command->cmd_sglist, Command->SegmentCount, Command->DmaDirection); - if (!end_that_request_first(Request, UpToDate, Command->BlockCount)) { - add_disk_randomness(Request->rq_disk); - end_that_request_last(Request, UpToDate); - + if (!__blk_end_request(Request, UpToDate, Command->BlockCount << 9)) { if (Command->Completion) { complete(Command->Completion); Command->Completion = NULL; - 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/