3 files changed, 12 insertions, 7 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 476244d59309..35607dd0223b 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2447,14 +2447,16 @@ struct request *blk_peek_request(struct request_queue *q)
 
                         rq = NULL;
                         break;
-                } else if (ret == BLKPREP_KILL) {
+                } else if (ret == BLKPREP_KILL || ret == BLKPREP_INVALID) {
+                        int err = (ret == BLKPREP_INVALID) ? -EREMOTEIO : -EIO;
+
                         rq->cmd_flags |= REQ_QUIET;
                         /*
                          * Mark this request as started so we don't trigger
                          * any debug logic in the end I/O path.
                          */
                         blk_start_request(rq);
-                        __blk_end_request_all(rq, -EIO);
+                        __blk_end_request_all(rq, err);
                 } else {
                         printk(KERN_ERR "%s: bad return=%d\n", __func__, ret);
                         break;
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index ec163d08f6c3..6e841c6da632 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -761,7 +761,7 @@ static int sd_setup_discard_cmnd(struct scsi_cmnd *cmd)
                 break;
 
         default:
-                ret = BLKPREP_KILL;
+                ret = BLKPREP_INVALID;
                 goto out;
         }
 
@@ -839,7 +839,7 @@ static int sd_setup_write_same_cmnd(struct scsi_cmnd *cmd)
         int ret;
 
         if (sdkp->device->no_write_same)
-                return BLKPREP_KILL;
+                return BLKPREP_INVALID;
 
         BUG_ON(bio_offset(bio) || bio_iovec(bio).bv_len != sdp->sector_size);
 
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index d372ea87ead5..a9b643a0647f 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -681,9 +681,12 @@ static inline bool blk_write_same_mergeable(struct bio *a, struct bio *b)
 /*
  * q->prep_rq_fn return values
  */
-#define BLKPREP_OK              0       /* serve it */
-#define BLKPREP_KILL            1       /* fatal error, kill */
-#define BLKPREP_DEFER           2       /* leave on queue */
+enum {
+        BLKPREP_OK,             /* serve it */
+        BLKPREP_KILL,           /* fatal error, kill, return -EIO */
+        BLKPREP_DEFER,          /* leave on queue */
+        BLKPREP_INVALID,        /* invalid command, kill, return -EREMOTEIO */
+};
 
 extern unsigned long blk_max_low_pfn, blk_max_pfn;