Merge git://github.com/davem330/ide

* git://github.com/davem330/ide: ide-disk: Fix request requeuing

Merge git://github.com/davem330/ide
* git://github.com/davem330/ide: ide-disk: Fix request requeuing
0d617928 · Linus Torvalds · 7fd21be7 · 2c8fc867 · 0d617928
Commit 0d617928 authored Oct 03, 2011 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

drivers/ide/ide-disk.c drivers/ide/ide-disk.c +6 -1

No files found.
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -435,7 +435,12 @@ static int idedisk_prep_fn(struct request_queue *q, struct request *rq)
 	if (!(rq->cmd_flags & REQ_FLUSH))
 		return BLKPREP_OK;

-	cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC);
+	if (rq->special) {
+		cmd = rq->special;
+		memset(cmd, 0, sizeof(*cmd));
+	} else {
+		cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC);
+	}

 	/* FIXME: map struct ide_taskfile on rq->cmd[] */
 	BUG_ON(cmd == NULL);