redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

ide: stop using q->prepare_flush_fn

Browse source 
use REQ_FLUSH flag instead.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: David S. Miller <davem@davemloft.net>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
This commit is contained in:
FUJITA Tomonori 2010-07-03 17:45:39 +09:00 committed by Jens Axboe
parent dd40e456a4
commit afc2306810
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/ide/ide-disk.c
View file

@ -427,10 +427,15 @@ static void ide_disk_unlock_native_capacity(ide_drive_t *drive)
drive->dev_flags |= IDE_DFLAG_NOHPA; /* disable HPA on resume */ drive->dev_flags |= IDE_DFLAG_NOHPA; /* disable HPA on resume */
} }
static void idedisk_prepare_flush(struct request_queue *q, struct request *rq) static int idedisk_prep_fn(struct request_queue *q, struct request *rq)
{ {
ide_drive_t *drive = q->queuedata; ide_drive_t *drive = q->queuedata;
struct ide_cmd *cmd = kmalloc(sizeof(*cmd), GFP_ATOMIC); struct ide_cmd *cmd;
if (!(rq->cmd_flags & REQ_FLUSH))
return BLKPREP_OK;
cmd = kmalloc(sizeof(*cmd), GFP_ATOMIC);
/* FIXME: map struct ide_taskfile on rq->cmd[] */ /* FIXME: map struct ide_taskfile on rq->cmd[] */
BUG_ON(cmd == NULL); BUG_ON(cmd == NULL);
@ -448,6 +453,8 @@ static void idedisk_prepare_flush(struct request_queue *q, struct request *rq)
rq->cmd_type = REQ_TYPE_ATA_TASKFILE; rq->cmd_type = REQ_TYPE_ATA_TASKFILE;
rq->special = cmd; rq->special = cmd;
cmd->rq = rq; cmd->rq = rq;
return BLKPREP_OK;
} }
ide_devset_get(multcount, mult_count); ide_devset_get(multcount, mult_count);
@ -513,7 +520,6 @@ static void update_ordered(ide_drive_t *drive)
{ {
u16 *id = drive->id; u16 *id = drive->id;
unsigned ordered = QUEUE_ORDERED_NONE; unsigned ordered = QUEUE_ORDERED_NONE;
prepare_flush_fn *prep_fn = NULL;
if (drive->dev_flags & IDE_DFLAG_WCACHE) { if (drive->dev_flags & IDE_DFLAG_WCACHE) {
unsigned long long capacity; unsigned long long capacity;
@ -538,12 +544,12 @@ static void update_ordered(ide_drive_t *drive)
if (barrier) { if (barrier) {
ordered = QUEUE_ORDERED_DRAIN_FLUSH; ordered = QUEUE_ORDERED_DRAIN_FLUSH;
prep_fn = idedisk_prepare_flush; blk_queue_prep_rq(drive->queue, idedisk_prep_fn);
} }
} else } else
ordered = QUEUE_ORDERED_DRAIN; ordered = QUEUE_ORDERED_DRAIN;
blk_queue_ordered(drive->queue, ordered, prep_fn); blk_queue_ordered(drive->queue, ordered, NULL);
} }
ide_devset_get_flag(wcache, IDE_DFLAG_WCACHE); ide_devset_get_flag(wcache, IDE_DFLAG_WCACHE);