Skip to contentSkip to conversation

ide: set REQ_NOMERGE request flag in ide_do_drive_cmd()

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 3 messages May 3, 2008 – May 5, 2008 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 2/3 ide: set REQ_NOMERGE request flag in ide_do_drive_cmd()

This is a preparation for converting IDE to use blk_execute_rq().

There should be no functional changes caused by this patch.

Cc FUJITA Tomonori <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Jens Axboe <[email protected]>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
 drivers/ide/ide-io.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/ide/ide-io.c +2 -0
Index: b/drivers/ide/ide-io.c
===================================================================
@@ -1603,6 +1603,8 @@ int ide_do_drive_cmd (ide_drive_t *drive
 	if (action == ide_preempt || action == ide_head_wait)
 		where = ELEVATOR_INSERT_FRONT;
 
+	rq->cmd_flags |= REQ_NOMERGE;
+
 	spin_lock_irqsave(&ide_lock, flags);
 	if (action == ide_preempt)
 		hwgroup->rq = NULL;
#1 lore raw
Quoted 11 lines · On Sat, 3 May 2008 15:14:24 +0200 Bartlomiej Zolnierkiewicz…

This is a preparation for converting IDE to use blk_execute_rq().

There should be no functional changes caused by this patch.

Cc FUJITA Tomonori <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Jens Axboe <[email protected]>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
 drivers/ide/ide-io.c |    2 ++
 1 file changed, 2 insertions(+)

I think that you can drop this since the block layer doesn't check REQ_NOMERGE with the way ide_do_drive_cmd queues requests.

author
#2 lore raw
Quoted 15 lines · FUJITA Tomonori
Quoted 11 lines · On Sat, 3 May 2008 15:14:24 +0200 Bartlomiej Zolnierkiewicz…

This is a preparation for converting IDE to use blk_execute_rq().

There should be no functional changes caused by this patch.

Cc FUJITA Tomonori <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Jens Axboe <[email protected]>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
 drivers/ide/ide-io.c |    2 ++
 1 file changed, 2 insertions(+)
Quoted 2 lines

I think that you can drop this since the block layer doesn't check REQ_NOMERGE with the way ide_do_drive_cmd queues requests.

Yeah, I see now that REQ_NOMERGE only matters for fs requests.

Dropped.