Skip to contentSkip to conversation

ide: unify request completion methods

PATCH New Bartlomiej Zolnierkiewicz 1 participant 10 messages Feb 9, 2009 libata

lore
Share & tools
lore
#0 lore raw

cover ide: unify request completion methods

Unify request completion methods so we (almost) always complete requests using ide_complete_rq(). As a nice side-effect it de-convolutes a lot of tricky code allowing further improvements later...

On top of pata-2.6 tree.

diffstat:

 drivers/ide/ide-atapi.c    |   20 +++-
 drivers/ide/ide-cd.c       |   18 ++--
 drivers/ide/ide-devsets.c  |    4 
 drivers/ide/ide-disk.c     |    4 
 drivers/ide/ide-dma.c      |    3 
 drivers/ide/ide-eh.c       |   14 ++-
 drivers/ide/ide-floppy.c   |   10 +-
 drivers/ide/ide-io.c       |  188 ++++++++++++++++-----------------------------
 drivers/ide/ide-tape.c     |    8 +
 drivers/ide/ide-taskfile.c |   10 +-
 include/linux/ide.h        |   10 +-
 11 files changed, 130 insertions(+), 159 deletions(-)
#1 lore raw

PATCH 1/9 ide: make ide_special_rq() BUG() on unknown requests

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: make ide_special_rq() BUG() on unknown requests

If unknown request reaches this function something is _seriously_ wrong.

---
 drivers/ide/ide-io.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/ide/ide-io.c +1 -3
Index: b/drivers/ide/ide-io.c
===================================================================
@@ -353,9 +353,7 @@ static ide_startstop_t ide_special_rq(id
 	case REQ_DRIVE_RESET:
 		return ide_do_reset(drive);
 	default:
-		blk_dump_rq_flags(rq, "ide_special_rq - bad request");
-		ide_end_request(drive, 0, 0);
-		return ide_stopped;
+		BUG();
 	}
 }
 
#2 lore raw

PATCH 2/9 ide: add ide_end_rq()

In reply to Bartlomiej Zolnierkiewicz

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: add ide_end_rq()

* Move request dequeuing from __ide_end_request() to ide_end_request().

* Rename __ide_end_request() to ide_end_rq() and export it.

* Fix ide_end_rq() to pass original blk_end_request() return value.

* ide_end_dequeued_request() is used only in cdrom_end_request() so inline it there and then remove the function.

There should be no functional changes caused by this patch.

---
 drivers/ide/ide-cd.c |    6 ++++--
 drivers/ide/ide-io.c |   45 ++++++++++-----------------------------------
 include/linux/ide.h  |    2 +-
 3 files changed, 15 insertions(+), 38 deletions(-)
drivers/ide/ide-cd.c +4 -2
Index: b/drivers/ide/ide-cd.c
===================================================================
@@ -264,8 +264,10 @@ static void cdrom_end_request(ide_drive_
 			 * now end the failed request
 			 */
 			if (blk_fs_request(failed)) {
-				if (ide_end_dequeued_request(drive, failed, 0,
-						failed->hard_nr_sectors))
+				BUG_ON(!blk_rq_started(rq));
+
+				if (ide_end_rq(drive, failed, 0,
+						failed->hard_nr_sectors << 9))
 					BUG();
 			} else {
 				if (blk_end_request(failed, -EIO,
drivers/ide/ide-io.c +10 -35

73 lines not on this page · raw message

include/linux/ide.h +1 -1
Index: b/include/linux/ide.h
===================================================================
@@ -1128,8 +1128,8 @@ int generic_ide_ioctl(ide_drive_t *, str
 extern int ide_vlb_clk;
 extern int ide_pci_clk;
 
+int ide_end_rq(ide_drive_t *, struct request *, int, unsigned int);
 int ide_end_request(ide_drive_t *, int, int);
-int ide_end_dequeued_request(ide_drive_t *, struct request *, int, int);
 void ide_kill_rq(ide_drive_t *, struct request *);
 
 void __ide_set_handler(ide_drive_t *, ide_handler_t *, unsigned int,
#3 lore raw

PATCH 3/9 ide: sanitize ide_end_rq()

In reply to Bartlomiej Zolnierkiewicz

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: sanitize ide_end_rq()

* Move 'uptodate' quirk from ide_end_rq() to its users.

* Move quirks for blk_noretry_request() and !blk_fs_request() requests from ide_end_rq() to ide_end_request().

There should be no functional changes caused by this patch.

---
 drivers/ide/ide-cd.c |    2 +-
 drivers/ide/ide-io.c |   34 ++++++++++++++++------------------
 2 files changed, 17 insertions(+), 19 deletions(-)
drivers/ide/ide-cd.c +1 -1
Index: b/drivers/ide/ide-cd.c
===================================================================
@@ -266,7 +266,7 @@ static void cdrom_end_request(ide_drive_
 			if (blk_fs_request(failed)) {
 				BUG_ON(!blk_rq_started(rq));
 
-				if (ide_end_rq(drive, failed, 0,
+				if (ide_end_rq(drive, failed, -EIO,
 						failed->hard_nr_sectors << 9))
 					BUG();
 			} else {
drivers/ide/ide-io.c +16 -18
Index: b/drivers/ide/ide-io.c
===================================================================
@@ -54,24 +54,9 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
-int ide_end_rq(ide_drive_t *drive, struct request *rq, int uptodate,
+int ide_end_rq(ide_drive_t *drive, struct request *rq, int error,
 	       unsigned int nr_bytes)
 {
-	int error = 0;
-
-	if (uptodate <= 0)
-		error = uptodate ? uptodate : -EIO;
-
-	/*
-	 * if failfast is set on a request, override number of sectors and
-	 * complete the whole request right now
-	 */
-	if (blk_noretry_request(rq) && error)
-		nr_bytes = rq->hard_nr_sectors << 9;
-
-	if (!blk_fs_request(rq) && error && !rq->errors)
-		rq->errors = -EIO;
-
 	/*
 	 * decide whether to reenable DMA -- 3 is a random magic for now,
 	 * if we DMA timeout more than 3 times, just stay in PIO
@@ -101,7 +86,7 @@ int ide_end_request (ide_drive_t *drive,
 {
 	unsigned int nr_bytes = nr_sectors << 9;
 	struct request *rq = drive->hwif->rq;
-	int rc;
+	int rc, error = 0;
 
 	if (!nr_bytes) {
 		if (blk_pc_request(rq))
@@ -110,7 +95,20 @@ int ide_end_request (ide_drive_t *drive,
 			nr_bytes = rq->hard_cur_sectors << 9;
 	}
 
-	rc = ide_end_rq(drive, rq, uptodate, nr_bytes);
+	/*
+	 * if failfast is set on a request, override number of sectors
+	 * and complete the whole request right now
+	 */
+	if (blk_noretry_request(rq) && uptodate <= 0)
+		nr_bytes = rq->hard_nr_sectors << 9;
+
+	if (blk_fs_request(rq) == 0 && uptodate <= 0 && rq->errors == 0)
+		rq->errors = -EIO;
+
+	if (uptodate <= 0)
+		error = uptodate ? uptodate : -EIO;
+
+	rc = ide_end_rq(drive, rq, error, nr_bytes);
 	if (rc == 0)
 		drive->hwif->rq = NULL;
 
#4 lore raw

PATCH 4/9 ide: pass error value to ide_complete_rq()

In reply to Bartlomiej Zolnierkiewicz

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: pass error value to ide_complete_rq()

Set rq->errors at ide_complete_rq() call sites and then pass error value to ide_complete_rq().

[ Some rq->errors assignments look really wrong but this patch
leaves them alone to not introduce too many changes at once. ]

There should be no functional changes caused by this patch.

---
 drivers/ide/ide-atapi.c    |    5 +++--
 drivers/ide/ide-eh.c       |    5 +++--
 drivers/ide/ide-floppy.c   |    2 +-
 drivers/ide/ide-io.c       |   19 +++++++++----------
 drivers/ide/ide-tape.c     |    2 +-
 drivers/ide/ide-taskfile.c |    4 +++-
 include/linux/ide.h        |    2 +-
 7 files changed, 21 insertions(+), 18 deletions(-)
drivers/ide/ide-atapi.c +3 -2
Index: b/drivers/ide/ide-atapi.c
===================================================================
@@ -390,9 +390,10 @@ static ide_startstop_t ide_pc_intr(ide_d
 		if (uptodate == 0)
 			drive->failed_pc = NULL;
 
-		if (blk_special_request(rq))
+		if (blk_special_request(rq)) {
+			rq->errors = 0;
 			ide_complete_rq(drive, 0);
-		else
+		} else
 			ide_end_request(drive, uptodate, 0);
 
 		return ide_stopped;
drivers/ide/ide-eh.c +3 -2
Index: b/drivers/ide/ide-eh.c
===================================================================
@@ -123,17 +123,18 @@ ide_startstop_t ide_error(ide_drive_t *d
 
 	/* retry only "normal" I/O: */
 	if (!blk_fs_request(rq)) {
-		rq->errors = 1;
 		if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE) {
 			struct ide_cmd *cmd = rq->special;
 
 			if (cmd)
 				ide_complete_cmd(drive, cmd, stat, err);
 		} else if (blk_pm_request(rq)) {
+			rq->errors = 1;
 			ide_complete_pm_rq(drive, rq);
 			return ide_stopped;
 		}
-		ide_complete_rq(drive, err);
+		rq->errors = err;
+		ide_complete_rq(drive, err ? -EIO : 0);
 		return ide_stopped;
 	}
 
drivers/ide/ide-floppy.c +1 -1
Index: b/drivers/ide/ide-floppy.c
===================================================================
@@ -260,7 +260,7 @@ static ide_startstop_t ide_floppy_do_req
 			printk(KERN_ERR PFX "%s: I/O error\n", drive->name);
 
 		if (blk_special_request(rq)) {
-			rq->errors = IDE_DRV_ERROR_GENERAL;
+			rq->errors = 0;
 			ide_complete_rq(drive, 0);
 			return ide_stopped;
 		} else
drivers/ide/ide-io.c +9 -10
Index: b/drivers/ide/ide-io.c
===================================================================
@@ -140,17 +140,14 @@ void ide_complete_cmd(ide_drive_t *drive
 		kfree(cmd);
 }
 
-void ide_complete_rq(ide_drive_t *drive, u8 err)
+void ide_complete_rq(ide_drive_t *drive, int error)
 {
 	ide_hwif_t *hwif = drive->hwif;
 	struct request *rq = hwif->rq;
 
 	hwif->rq = NULL;
 
-	rq->errors = err;
-
-	if (unlikely(blk_end_request(rq, (rq->errors ? -EIO : 0),
-				     blk_rq_bytes(rq))))
+	if (unlikely(blk_end_request(rq, error, blk_rq_bytes(rq))))
 		BUG();
 }
 EXPORT_SYMBOL(ide_complete_rq);
@@ -162,13 +159,14 @@ void ide_kill_rq(ide_drive_t *drive, str
 
 	drive->failed_pc = NULL;
 
-	if ((media == ide_floppy && drv_req) || media == ide_tape)
-		rq->errors = IDE_DRV_ERROR_GENERAL;
-
-	if ((media == ide_floppy || media == ide_tape) && drv_req)
+	if ((media == ide_floppy || media == ide_tape) && drv_req) {
+		rq->errors = 0;
 		ide_complete_rq(drive, 0);
-	else
+	} else {
+		if (media == ide_tape)
+			rq->errors = IDE_DRV_ERROR_GENERAL;
 		ide_end_request(drive, 0, 0);
+	}
 }
 
 static void ide_tf_set_specify_cmd(ide_drive_t *drive, struct ide_taskfile *tf)
@@ -308,6 +306,7 @@ static ide_startstop_t execute_drive_cmd
 #ifdef DEBUG
  	printk("%s: DRIVE_CMD (null)\n", drive->name);
 #endif
+	rq->errors = 0;
 	ide_complete_rq(drive, 0);
 
  	return ide_stopped;
drivers/ide/ide-tape.c +1 -1
Index: b/drivers/ide/ide-tape.c
===================================================================
@@ -774,8 +774,8 @@ static ide_startstop_t idetape_do_reques
 		if (rq != postponed_rq) {
 			printk(KERN_ERR "ide-tape: ide-tape.c bug - "
 					"Two DSC requests were queued\n");
-			rq->errors = IDE_DRV_ERROR_GENERAL;
 			drive->failed_pc = NULL;
+			rq->errors = 0;
 			ide_complete_rq(drive, 0);
 			return ide_stopped;
 		}
drivers/ide/ide-taskfile.c +3 -1
Index: b/drivers/ide/ide-taskfile.c
===================================================================
@@ -289,10 +289,12 @@ static void ide_error_cmd(ide_drive_t *d
 
 void ide_finish_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat)
 {
+	struct request *rq = drive->hwif->rq;
 	u8 err = ide_read_error(drive);
 
 	ide_complete_cmd(drive, cmd, stat, err);
-	ide_complete_rq(drive, err);
+	rq->errors = err;
+	ide_complete_rq(drive, err ? -EIO : 0);
 }
 
 /*
include/linux/ide.h +1 -1
Index: b/include/linux/ide.h
===================================================================
@@ -1163,7 +1163,7 @@ extern int ide_devset_execute(ide_drive_
 			      const struct ide_devset *setting, int arg);
 
 void ide_complete_cmd(ide_drive_t *, struct ide_cmd *, u8, u8);
-void ide_complete_rq(ide_drive_t *, u8);
+void ide_complete_rq(ide_drive_t *, int);
 
 void ide_tf_dump(const char *, struct ide_taskfile *);
 
#5 lore raw

PATCH 5/9 ide: move rq->errors quirk out from ide_end_request()

In reply to Bartlomiej Zolnierkiewicz

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: move rq->errors quirk out from ide_end_request()

Move rq->errors quirk out from ide_end_request() to its call sites.

There should be no functional changes caused by this patch.

---
 drivers/ide/ide-atapi.c  |    7 ++++++-
 drivers/ide/ide-cd.c     |    3 +++
 drivers/ide/ide-disk.c   |    2 ++
 drivers/ide/ide-eh.c     |    5 ++++-
 drivers/ide/ide-floppy.c |    2 ++
 drivers/ide/ide-io.c     |    5 ++---
 drivers/ide/ide-tape.c   |    2 ++
 7 files changed, 21 insertions(+), 5 deletions(-)
drivers/ide/ide-atapi.c +6 -1
Index: b/drivers/ide/ide-atapi.c
===================================================================
@@ -393,8 +393,13 @@ static ide_startstop_t ide_pc_intr(ide_d
 		if (blk_special_request(rq)) {
 			rq->errors = 0;
 			ide_complete_rq(drive, 0);
-		} else
+		} else {
+			if (blk_fs_request(rq) == 0 && uptodate <= 0) {
+				if (rq->errors == 0)
+					rq->errors = -EIO;
+			}
 			ide_end_request(drive, uptodate, 0);
+		}
 
 		return ide_stopped;
 	}
drivers/ide/ide-cd.c +3 -0
Index: b/drivers/ide/ide-cd.c
===================================================================
@@ -289,6 +289,9 @@ static void cdrom_end_request(ide_drive_
 	ide_debug_log(IDE_DBG_FUNC, "uptodate: 0x%x, nsectors: %d",
 				    uptodate, nsectors);
 
+	if (blk_fs_request(rq) == 0 && uptodate <= 0 && rq->errors == 0)
+		rq->errors = -EIO;
+
 	ide_end_request(drive, uptodate, nsectors);
 }
 
drivers/ide/ide-disk.c +2 -0
Index: b/drivers/ide/ide-disk.c
===================================================================
@@ -184,6 +184,8 @@ static ide_startstop_t ide_do_rw_disk(id
 
 	if (!blk_fs_request(rq)) {
 		blk_dump_rq_flags(rq, "ide_do_rw_disk - bad command");
+		if (rq->errors == 0)
+			rq->errors = -EIO;
 		ide_end_request(drive, 0, 0);
 		return ide_stopped;
 	}
drivers/ide/ide-eh.c +4 -1
Index: b/drivers/ide/ide-eh.c
===================================================================
@@ -146,8 +146,11 @@ static inline void ide_complete_drive_re
 {
 	struct request *rq = drive->hwif->rq;
 
-	if (rq && blk_special_request(rq) && rq->cmd[0] == REQ_DRIVE_RESET)
+	if (rq && blk_special_request(rq) && rq->cmd[0] == REQ_DRIVE_RESET) {
+		if (err <= 0 && rq->errors == 0)
+			rq->errors = -EIO;
 		ide_end_request(drive, err ? err : 1, 0);
+	}
 }
 
 /* needed below */
drivers/ide/ide-floppy.c +2 -0
Index: b/drivers/ide/ide-floppy.c
===================================================================
@@ -296,6 +296,8 @@ static ide_startstop_t ide_floppy_do_req
 	return idefloppy_issue_pc(drive, pc);
 out_end:
 	drive->failed_pc = NULL;
+	if (blk_fs_request(rq) == 0 && rq->errors == 0)
+		rq->errors = -EIO;
 	ide_end_request(drive, 0, 0);
 	return ide_stopped;
 }
drivers/ide/ide-io.c +2 -3
Index: b/drivers/ide/ide-io.c
===================================================================
@@ -102,9 +102,6 @@ int ide_end_request (ide_drive_t *drive,
 	if (blk_noretry_request(rq) && uptodate <= 0)
 		nr_bytes = rq->hard_nr_sectors << 9;
 
-	if (blk_fs_request(rq) == 0 && uptodate <= 0 && rq->errors == 0)
-		rq->errors = -EIO;
-
 	if (uptodate <= 0)
 		error = uptodate ? uptodate : -EIO;
 
@@ -165,6 +162,8 @@ void ide_kill_rq(ide_drive_t *drive, str
 	} else {
 		if (media == ide_tape)
 			rq->errors = IDE_DRV_ERROR_GENERAL;
+		else if (blk_fs_request(rq) == 0 && rq->errors == 0)
+			rq->errors = -EIO;
 		ide_end_request(drive, 0, 0);
 	}
 }
drivers/ide/ide-tape.c +2 -0
Index: b/drivers/ide/ide-tape.c
===================================================================
@@ -760,6 +760,8 @@ static ide_startstop_t idetape_do_reques
 		/* We do not support buffer cache originated requests. */
 		printk(KERN_NOTICE "ide-tape: %s: Unsupported request in "
 			"request queue (%d)\n", drive->name, rq->cmd_type);
+		if (blk_fs_request(rq) == 0 && rq->errors == 0)
+			rq->errors = -EIO;
 		ide_end_request(drive, 0, 0);
 		return ide_stopped;
 	}
#6 lore raw

PATCH 6/9 ide: remove BUG() from ide_complete_rq()

In reply to Bartlomiej Zolnierkiewicz

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: remove BUG() from ide_complete_rq()

It is no longer needed so remove it, also while at it dequeue the request only on blk_end_request() success and make ide_complete_rq() return an error value.

---
 drivers/ide/ide-io.c |   10 ++++++----
 include/linux/ide.h  |    2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
drivers/ide/ide-io.c +6 -4
Index: b/drivers/ide/ide-io.c
===================================================================
@@ -137,15 +137,17 @@ void ide_complete_cmd(ide_drive_t *drive
 		kfree(cmd);
 }
 
-void ide_complete_rq(ide_drive_t *drive, int error)
+int ide_complete_rq(ide_drive_t *drive, int error)
 {
 	ide_hwif_t *hwif = drive->hwif;
 	struct request *rq = hwif->rq;
+	int rc;
 
-	hwif->rq = NULL;
+	rc = blk_end_request(rq, error, blk_rq_bytes(rq));
+	if (rc == 0)
+		hwif->rq = NULL;
 
-	if (unlikely(blk_end_request(rq, error, blk_rq_bytes(rq))))
-		BUG();
+	return rc;
 }
 EXPORT_SYMBOL(ide_complete_rq);
 
include/linux/ide.h +1 -1
Index: b/include/linux/ide.h
===================================================================
@@ -1163,7 +1163,7 @@ extern int ide_devset_execute(ide_drive_
 			      const struct ide_devset *setting, int arg);
 
 void ide_complete_cmd(ide_drive_t *, struct ide_cmd *, u8, u8);
-void ide_complete_rq(ide_drive_t *, int);
+int ide_complete_rq(ide_drive_t *, int);
 
 void ide_tf_dump(const char *, struct ide_taskfile *);
 
#7 lore raw

PATCH 7/9 ide: pass number of bytes to complete to ide_complete_rq()

In reply to Bartlomiej Zolnierkiewicz

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: pass number of bytes to complete to ide_complete_rq()

There should be no functional changes caused by this patch.

---
 drivers/ide/ide-atapi.c    |    2 +-
 drivers/ide/ide-eh.c       |    2 +-
 drivers/ide/ide-floppy.c   |    2 +-
 drivers/ide/ide-io.c       |    8 ++++----
 drivers/ide/ide-tape.c     |    2 +-
 drivers/ide/ide-taskfile.c |    2 +-
 include/linux/ide.h        |    2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)
drivers/ide/ide-atapi.c +1 -1
Index: b/drivers/ide/ide-atapi.c
===================================================================
@@ -392,7 +392,7 @@ static ide_startstop_t ide_pc_intr(ide_d
 
 		if (blk_special_request(rq)) {
 			rq->errors = 0;
-			ide_complete_rq(drive, 0);
+			ide_complete_rq(drive, 0, blk_rq_bytes(rq));
 		} else {
 			if (blk_fs_request(rq) == 0 && uptodate <= 0) {
 				if (rq->errors == 0)
drivers/ide/ide-eh.c +1 -1
Index: b/drivers/ide/ide-eh.c
===================================================================
@@ -134,7 +134,7 @@ ide_startstop_t ide_error(ide_drive_t *d
 			return ide_stopped;
 		}
 		rq->errors = err;
-		ide_complete_rq(drive, err ? -EIO : 0);
+		ide_complete_rq(drive, err ? -EIO : 0, blk_rq_bytes(rq));
 		return ide_stopped;
 	}
 
drivers/ide/ide-floppy.c +1 -1
Index: b/drivers/ide/ide-floppy.c
===================================================================
@@ -261,7 +261,7 @@ static ide_startstop_t ide_floppy_do_req
 
 		if (blk_special_request(rq)) {
 			rq->errors = 0;
-			ide_complete_rq(drive, 0);
+			ide_complete_rq(drive, 0, blk_rq_bytes(rq));
 			return ide_stopped;
 		} else
 			goto out_end;
drivers/ide/ide-io.c +4 -4
Index: b/drivers/ide/ide-io.c
===================================================================
@@ -137,13 +137,13 @@ void ide_complete_cmd(ide_drive_t *drive
 		kfree(cmd);
 }
 
-int ide_complete_rq(ide_drive_t *drive, int error)
+int ide_complete_rq(ide_drive_t *drive, int error, unsigned int nr_bytes)
 {
 	ide_hwif_t *hwif = drive->hwif;
 	struct request *rq = hwif->rq;
 	int rc;
 
-	rc = blk_end_request(rq, error, blk_rq_bytes(rq));
+	rc = blk_end_request(rq, error, nr_bytes);
 	if (rc == 0)
 		hwif->rq = NULL;
 
@@ -160,7 +160,7 @@ void ide_kill_rq(ide_drive_t *drive, str
 
 	if ((media == ide_floppy || media == ide_tape) && drv_req) {
 		rq->errors = 0;
-		ide_complete_rq(drive, 0);
+		ide_complete_rq(drive, 0, blk_rq_bytes(rq));
 	} else {
 		if (media == ide_tape)
 			rq->errors = IDE_DRV_ERROR_GENERAL;
@@ -308,7 +308,7 @@ static ide_startstop_t execute_drive_cmd
  	printk("%s: DRIVE_CMD (null)\n", drive->name);
 #endif
 	rq->errors = 0;
-	ide_complete_rq(drive, 0);
+	ide_complete_rq(drive, 0, blk_rq_bytes(rq));
 
  	return ide_stopped;
 }
drivers/ide/ide-tape.c +1 -1
Index: b/drivers/ide/ide-tape.c
===================================================================
@@ -778,7 +778,7 @@ static ide_startstop_t idetape_do_reques
 					"Two DSC requests were queued\n");
 			drive->failed_pc = NULL;
 			rq->errors = 0;
-			ide_complete_rq(drive, 0);
+			ide_complete_rq(drive, 0, blk_rq_bytes(rq));
 			return ide_stopped;
 		}
 
drivers/ide/ide-taskfile.c +1 -1
Index: b/drivers/ide/ide-taskfile.c
===================================================================
@@ -294,7 +294,7 @@ void ide_finish_cmd(ide_drive_t *drive, 
 
 	ide_complete_cmd(drive, cmd, stat, err);
 	rq->errors = err;
-	ide_complete_rq(drive, err ? -EIO : 0);
+	ide_complete_rq(drive, err ? -EIO : 0, blk_rq_bytes(rq));
 }
 
 /*
include/linux/ide.h +1 -1
Index: b/include/linux/ide.h
===================================================================
@@ -1163,7 +1163,7 @@ extern int ide_devset_execute(ide_drive_
 			      const struct ide_devset *setting, int arg);
 
 void ide_complete_cmd(ide_drive_t *, struct ide_cmd *, u8, u8);
-int ide_complete_rq(ide_drive_t *, int);
+int ide_complete_rq(ide_drive_t *, int, unsigned int);
 
 void ide_tf_dump(const char *, struct ide_taskfile *);
 
#8 lore raw

PATCH 8/9 ide: use ide_end_rq() in ide_complete_rq()

In reply to Bartlomiej Zolnierkiewicz

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: use ide_end_rq() in ide_complete_rq()

This results in PIO->DMA retry being triggered also on completion of requests using ide_complete_rq() instead of ide_end_request().

---
 drivers/ide/ide-io.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ide/ide-io.c +1 -1
Index: b/drivers/ide/ide-io.c
===================================================================
@@ -143,7 +143,7 @@ int ide_complete_rq(ide_drive_t *drive, 
 	struct request *rq = hwif->rq;
 	int rc;
 
-	rc = blk_end_request(rq, error, nr_bytes);
+	rc = ide_end_rq(drive, rq, error, nr_bytes);
 	if (rc == 0)
 		hwif->rq = NULL;
 
#9 lore raw

PATCH 9/9 ide: remove ide_end_request()

In reply to Bartlomiej Zolnierkiewicz

From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] ide: remove ide_end_request()

* Add ide_rq_bytes() helper.

* Add blk_noretry_request() quirk to ide_complete_rq() (currently only fs requests can be marked as "noretry" so there is no change in behavior).

* Switch current ide_end_request() users to use ide_complete_rq().

[ No need to check for rq->nr_sectors == 0 in {ide_dma,task_pio}_intr(),

    nsectors == 0 in cdrom_end_request() and err == 0 in ide_do_devset(). ]

* Remove no longer needed ide_end_request().

There should be no functional changes caused by this patch.

---
 drivers/ide/ide-atapi.c    |    6 ++--
 drivers/ide/ide-cd.c       |    7 ++---
 drivers/ide/ide-devsets.c  |    4 --
 drivers/ide/ide-disk.c     |    2 -
 drivers/ide/ide-dma.c      |    3 +-
 drivers/ide/ide-eh.c       |    2 -
 drivers/ide/ide-floppy.c   |    4 +-
 drivers/ide/ide-io.c       |   61 +++++++++++++--------------------------------
 drivers/ide/ide-tape.c     |    2 -
 drivers/ide/ide-taskfile.c |    4 +-
 include/linux/ide.h        |    2 -
 11 files changed, 37 insertions(+), 60 deletions(-)
drivers/ide/ide-atapi.c +4 -2
Index: b/drivers/ide/ide-atapi.c
===================================================================
@@ -398,7 +398,8 @@ static ide_startstop_t ide_pc_intr(ide_d
 				if (rq->errors == 0)
 					rq->errors = -EIO;
 			}
-			ide_end_request(drive, uptodate, 0);
+			ide_complete_rq(drive, uptodate ? 0 : -EIO,
+					ide_rq_bytes(rq));
 		}
 
 		return ide_stopped;
@@ -457,7 +458,8 @@ static ide_startstop_t ide_pc_intr(ide_d
 
 		/* FIXME: don't do partial completions */
 		if (drive->media == ide_floppy)
-			ide_end_request(drive, 1, done >> 9);
+			ide_complete_rq(drive, 0,
+					done ? done : ide_rq_bytes(rq));
 	} else
 		xferfunc(drive, NULL, pc->cur_pos, bcount);
 
drivers/ide/ide-cd.c +4 -3
Index: b/drivers/ide/ide-cd.c
===================================================================
@@ -292,7 +292,7 @@ static void cdrom_end_request(ide_drive_
 	if (blk_fs_request(rq) == 0 && uptodate <= 0 && rq->errors == 0)
 		rq->errors = -EIO;
 
-	ide_end_request(drive, uptodate, nsectors);
+	ide_complete_rq(drive, uptodate ? 0 : -EIO, nsectors << 9);
 }
 
 static void ide_dump_status_no_sense(ide_drive_t *drive, const char *msg, u8 st)
@@ -787,10 +787,11 @@ static ide_startstop_t cdrom_newpc_intr(
 		if (dma_error)
 			return ide_error(drive, "dma error", stat);
 		if (blk_fs_request(rq)) {
-			ide_end_request(drive, 1, rq->nr_sectors);
+			ide_complete_rq(drive, 0, rq->nr_sectors
+				? (rq->nr_sectors << 9) : ide_rq_bytes(rq));
 			return ide_stopped;
 		} else if (rq->cmd_type == REQ_TYPE_ATA_PC && !rq->bio) {
-			ide_end_request(drive, 1, 1);
+			ide_complete_rq(drive, 0, 512);
 			return ide_stopped;
 		}
 		goto end_request;
drivers/ide/ide-devsets.c +1 -3
Index: b/drivers/ide/ide-devsets.c
===================================================================
@@ -183,8 +183,6 @@ ide_startstop_t ide_do_devset(ide_drive_
 	err = setfunc(drive, *(int *)&rq->cmd[1]);
 	if (err)
 		rq->errors = err;
-	else
-		err = 1;
-	ide_end_request(drive, err, 0);
+	ide_complete_rq(drive, err, ide_rq_bytes(rq));
 	return ide_stopped;
 }
drivers/ide/ide-disk.c +1 -1
Index: b/drivers/ide/ide-disk.c
===================================================================
@@ -186,7 +186,7 @@ static ide_startstop_t ide_do_rw_disk(id
 		blk_dump_rq_flags(rq, "ide_do_rw_disk - bad command");
 		if (rq->errors == 0)
 			rq->errors = -EIO;
-		ide_end_request(drive, 0, 0);
+		ide_complete_rq(drive, -EIO, ide_rq_bytes(rq));
 		return ide_stopped;
 	}
 
drivers/ide/ide-dma.c +2 -1
Index: b/drivers/ide/ide-dma.c
===================================================================
@@ -101,7 +101,8 @@ ide_startstop_t ide_dma_intr(ide_drive_t
 			if ((cmd->tf_flags & IDE_TFLAG_FS) == 0)
 				ide_finish_cmd(drive, cmd, stat);
 			else
-				ide_end_request(drive, 1, cmd->rq->nr_sectors);
+				ide_complete_rq(drive, 0,
+						cmd->rq->nr_sectors << 9);
 			return ide_stopped;
 		}
 		printk(KERN_ERR "%s: %s: bad DMA status (0x%02x)\n",
drivers/ide/ide-eh.c +1 -1
Index: b/drivers/ide/ide-eh.c
===================================================================
@@ -149,7 +149,7 @@ static inline void ide_complete_drive_re
 	if (rq && blk_special_request(rq) && rq->cmd[0] == REQ_DRIVE_RESET) {
 		if (err <= 0 && rq->errors == 0)
 			rq->errors = -EIO;
-		ide_end_request(drive, err ? err : 1, 0);
+		ide_complete_rq(drive, err ? err : 0, ide_rq_bytes(rq));
 	}
 }
 
drivers/ide/ide-floppy.c +2 -2
Index: b/drivers/ide/ide-floppy.c
===================================================================
@@ -68,7 +68,7 @@ static void idefloppy_update_buffers(ide
 	struct bio *bio = rq->bio;
 
 	while ((bio = rq->bio) != NULL)
-		ide_end_request(drive, 1, 0);
+		ide_complete_rq(drive, 0, ide_rq_bytes(rq));
 }
 
 static int ide_floppy_callback(ide_drive_t *drive, int dsc)
@@ -298,7 +298,7 @@ out_end:
 	drive->failed_pc = NULL;
 	if (blk_fs_request(rq) == 0 && rq->errors == 0)
 		rq->errors = -EIO;
-	ide_end_request(drive, 0, 0);
+	ide_complete_rq(drive, -EIO, ide_rq_bytes(rq));
 	return ide_stopped;
 }
 
drivers/ide/ide-io.c +18 -43

85 lines not on this page · raw message

drivers/ide/ide-tape.c +1 -1
Index: b/drivers/ide/ide-tape.c
===================================================================
@@ -762,7 +762,7 @@ static ide_startstop_t idetape_do_reques
 			"request queue (%d)\n", drive->name, rq->cmd_type);
 		if (blk_fs_request(rq) == 0 && rq->errors == 0)
 			rq->errors = -EIO;
-		ide_end_request(drive, 0, 0);
+		ide_complete_rq(drive, -EIO, ide_rq_bytes(rq));
 		return ide_stopped;
 	}
 
drivers/ide/ide-taskfile.c +2 -2
Index: b/drivers/ide/ide-taskfile.c
===================================================================
@@ -283,7 +283,7 @@ static void ide_error_cmd(ide_drive_t *d
 		}
 
 		if (sectors > 0)
-			ide_end_request(drive, 1, sectors);
+			ide_complete_rq(drive, 0, sectors << 9);
 	}
 }
 
@@ -352,7 +352,7 @@ out_end:
 	if ((cmd->tf_flags & IDE_TFLAG_FS) == 0)
 		ide_finish_cmd(drive, cmd, stat);
 	else
-		ide_end_request(drive, 1, cmd->rq->nr_sectors);
+		ide_complete_rq(drive, 0, cmd->rq->nr_sectors << 9);
 	return ide_stopped;
 out_err:
 	ide_error_cmd(drive, cmd);
include/linux/ide.h +1 -1
Index: b/include/linux/ide.h
===================================================================
@@ -1128,8 +1128,8 @@ int generic_ide_ioctl(ide_drive_t *, str
 extern int ide_vlb_clk;
 extern int ide_pci_clk;
 
+unsigned int ide_rq_bytes(struct request *);
 int ide_end_rq(ide_drive_t *, struct request *, int, unsigned int);
-int ide_end_request(ide_drive_t *, int, int);
 void ide_kill_rq(ide_drive_t *, struct request *);
 
 void __ide_set_handler(ide_drive_t *, ide_handler_t *, unsigned int,