Re: [PATCH 4/5] ide: Add support for TRIM

[Sergei Shtylyov <sshtylyov@ru.mvista.com>]

Hello.

Matthew Wilcox wrote:

> From: David Woodhouse <David.Woodhouse@intel.com>

> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
> [modified to reduce amount of special casing needed for discard]
> Signed-off-by: Matthew Wilcox <willy@linux.intel.com>



> diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
> index c998cf8..ed34bd3 100644
> --- a/drivers/ide/ide-disk.c
> +++ b/drivers/ide/ide-disk.c
> @@ -404,6 +404,52 @@ static void idedisk_prepare_flush(struct request_queue *q, struct request *rq)
>  	rq->special = cmd;
>  }
>  
> +static int idedisk_prepare_discard(struct request_queue *q, struct request *rq,
> +							struct bio *bio)

    Weird indentation.

> +{
> +	ide_task_t *task;

    This patch is already obsolete as 'ide_task_t' is gone. Use 'struct 
ide_cmd' instead.

> +	unsigned size;
> +	struct page *page = alloc_page(GFP_KERNEL);

    Missing empty line after the declaration block...

> +	if (!page)
> +		goto error;

    Unneeded goto -- why not just return?

> +
> +	/* FIXME: map struct ide_taskfile on rq->cmd[] */
> +	task = kzalloc(sizeof(*task), GFP_KERNEL);
> +	if (!task)
> +		goto free_page;
> +
> +	size = ata_set_lba_range_entries(page_address(page), PAGE_SIZE,
> +					bio->bi_sector, bio_sectors(bio));
> +	bio->bi_size = 0;
> +	if (bio_add_pc_page(q, bio, page, size, 0) < size)
> +		goto free_task;
> +
> +	task->tf.command = ATA_CMD_DSM;
> +	task->tf.feature = ATA_DSM_TRIM;
> +	task->tf.hob_feature = 0x00;
> +	task->tf.nsect = size / 512;
> +	task->tf.hob_nsect = (size / 512) >> 8;
> +
> +	task->tf_flags   = IDE_TFLAG_LBA48 | IDE_TFLAG_OUT_HOB |
> +			   IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE |

    The last 3 flags are going to be obsoleted too...

MBR, Sergei