Re: [PATCH 24/28] blk_end_request: changing ide normal caller (take 3)

[Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>]

On Saturday 01 December 2007, Kiyoshi Ueda wrote:
> This patch converts "normal" parts of ide to use blk_end_request().
> 
> Signed-off-by: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
> Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
> ---
>  drivers/ide/ide-cd.c |    6 +++---
>  drivers/ide/ide-io.c |   17 ++++++-----------
>  2 files changed, 9 insertions(+), 14 deletions(-)

[...]

> Index: 2.6.24-rc3-mm2/drivers/ide/ide-io.c
> ===================================================================
> --- 2.6.24-rc3-mm2.orig/drivers/ide/ide-io.c
> +++ 2.6.24-rc3-mm2/drivers/ide/ide-io.c
> @@ -78,14 +78,9 @@ static int __ide_end_request(ide_drive_t
>  		ide_dma_on(drive);
>  	}
>  
> -	if (!end_that_request_chunk(rq, uptodate, nr_bytes)) {
> -		add_disk_randomness(rq->rq_disk);
> -		if (dequeue) {
> -			if (!list_empty(&rq->queuelist))
> -				blkdev_dequeue_request(rq);
> +	if (!__blk_end_request(rq, uptodate, nr_bytes)) {
> +		if (dequeue)
>  			HWGROUP(drive)->rq = NULL;
> -		}
> -		end_that_request_last(rq, uptodate);
>  		ret = 0;
>  	}

Hmmm, this seems to change the old behavior (the request should
be dequeued from the queue only if 'dequeue' variable is set)
and AFAIR some error handling code (in ide-cd?) depends on the
old behavior so please revisit this patch.

Thanks,
Bart