Merge branch 'pm-domains'

[cascardo/linux.git] / block / blk-exec.c

diff --git a/block/blk-exec.c b/block/blk-exec.c
index dbf4502..9924725 100644 (file)
--- a/block/blk-exec.c
+++ b/block/blk-exec.c
@@ -56,6 +56,7 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
        bool is_pm_resume;
 
        WARN_ON(irqs_disabled());
+       WARN_ON(rq->cmd_type == REQ_TYPE_FS);
 
        rq->rq_disk = bd_disk;
        rq->end_io = done;
@@ -132,6 +133,11 @@ int blk_execute_rq(struct request_queue *q, struct gendisk *bd_disk,
        if (rq->errors)
                err = -EIO;
 
+       if (rq->sense == sense) {
+               rq->sense = NULL;
+               rq->sense_len = 0;
+       }
+
        return err;
 }
 EXPORT_SYMBOL(blk_execute_rq);