block: convert pd_special_command to use blk_execute_rq

pd_special_command uses blk_put_request with struct request on the
stack. As a result, blk_put_request needs a hack to catch a NULL
request_queue.  This converts pd_special_command to use
blk_execute_rq.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 9 insertions, 11 deletions

diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 570f3b70dce7..5fdfa7c888ce 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -712,19 +712,17 @@ static void do_pd_request(struct request_queue * q)
 static int pd_special_command(struct pd_unit *disk,
                       enum action (*func)(struct pd_unit *disk))
 {
-        DECLARE_COMPLETION_ONSTACK(wait);
-        struct request rq;
+        struct request *rq;
         int err = 0;
 
-        blk_rq_init(NULL, &rq);
-        rq.rq_disk = disk->gd;
-        rq.end_io_data = &wait;
-        rq.end_io = blk_end_sync_rq;
-        blk_insert_request(disk->gd->queue, &rq, 0, func);
-        wait_for_completion(&wait);
-        if (rq.errors)
-                err = -EIO;
-        blk_put_request(&rq);
+        rq = blk_get_request(disk->gd->queue, READ, __GFP_WAIT);
+
+        rq->cmd_type = REQ_TYPE_SPECIAL;
+        rq->special = func;
+
+        err = blk_execute_rq(disk->gd->queue, disk->gd, rq, 0);
+
+        blk_put_request(rq);
         return err;
 }