All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hannes Reinecke <hare@suse.de>
To: Jens Axboe <axboe@fb.com>
Cc: linux-block@vger.kernel.org, linux-scsi@vger.kernel.org,
	Damien Le Moal <damien.lemoal@hgst.com>,
	Hannes Reinecke <hare@suse.de>
Subject: [PATCH 5/6] block: Introduce BLKPREP_DONE
Date: Tue, 19 Jul 2016 15:20:38 +0200	[thread overview]
Message-ID: <1468934439-93579-6-git-send-email-hare@suse.de> (raw)
In-Reply-To: <1468934439-93579-1-git-send-email-hare@suse.de>

Add a new blkprep return code BLKPREP_DONE to signal completion
without I/O error.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---
 block/blk-core.c        | 6 +++++-
 drivers/scsi/scsi_lib.c | 1 +
 include/linux/blkdev.h  | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/block/blk-core.c b/block/blk-core.c
index e273194..4bcf30a 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2462,9 +2462,13 @@ struct request *blk_peek_request(struct request_queue *q)
 
 			rq = NULL;
 			break;
-		} else if (ret == BLKPREP_KILL || ret == BLKPREP_INVALID) {
+		} else if (ret == BLKPREP_KILL || ret == BLKPREP_INVALID ||
+			   ret == BLKPREP_DONE) {
 			int err = (ret == BLKPREP_INVALID) ? -EREMOTEIO : -EIO;
 
+			if (ret == BLKPREP_DONE)
+				err = 0;
+
 			rq->cmd_flags |= REQ_QUIET;
 			/*
 			 * Mark this request as started so we don't trigger
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index b2e332a..f112926 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1257,6 +1257,7 @@ scsi_prep_return(struct request_queue *q, struct request *req, int ret)
 	case BLKPREP_KILL:
 	case BLKPREP_INVALID:
 		req->errors = DID_NO_CONNECT << 16;
+	case BLKPREP_DONE:
 		/* release the command and kill it */
 		if (req->special) {
 			struct scsi_cmnd *cmd = req->special;
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index d5e3d8b..c351444 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -736,6 +736,7 @@ enum {
 	BLKPREP_KILL,		/* fatal error, kill, return -EIO */
 	BLKPREP_DEFER,		/* leave on queue */
 	BLKPREP_INVALID,	/* invalid command, kill, return -EREMOTEIO */
+	BLKPREP_DONE,		/* complete w/o error */
 };
 
 extern unsigned long blk_max_low_pfn, blk_max_pfn;
-- 
1.8.5.6


  parent reply	other threads:[~2016-07-19 13:20 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-19 13:20 [PATCH 0/6] Support for zoned block devices Hannes Reinecke
2016-07-19 13:20 ` [PATCH 1/6] blk-sysfs: Add 'chunk_sectors' to sysfs attributes Hannes Reinecke
2016-07-20  1:02   ` Damien Le Moal
2016-07-20  1:02     ` Damien Le Moal
2016-07-21  5:59   ` Christoph Hellwig
2016-07-22 20:35   ` Martin K. Petersen
2016-07-19 13:20 ` [PATCH 2/6] block: update chunk_sectors in blk_stack_limits() Hannes Reinecke
2016-07-20  1:05   ` Damien Le Moal
2016-07-20  1:05     ` Damien Le Moal
2016-07-21  5:59   ` Christoph Hellwig
2016-07-22 20:46   ` Martin K. Petersen
2016-07-19 13:20 ` [PATCH 3/6] block: Implement support for zoned block devices Hannes Reinecke
2016-07-20  1:05   ` Damien Le Moal
2016-07-20  1:05     ` Damien Le Moal
2016-07-19 13:20 ` [PATCH 4/6] block: Add 'zoned' sysfs queue attribute Hannes Reinecke
2016-07-20  1:07   ` Damien Le Moal
2016-07-20  1:07     ` Damien Le Moal
2016-07-22 20:45   ` Martin K. Petersen
2016-07-23 12:43     ` Hannes Reinecke
2016-07-23 12:43       ` Hannes Reinecke
2016-07-23 22:13       ` Bart Van Assche
2016-07-23 22:13         ` Bart Van Assche
2016-07-24  7:10         ` Hannes Reinecke
2016-07-24  7:10           ` Hannes Reinecke
2016-07-24 13:37           ` Bart Van Assche
2016-07-24 13:37             ` Bart Van Assche
2016-07-24 13:51             ` Bart Van Assche
2016-07-24 23:22               ` Damien Le Moal
2016-07-25  5:56               ` Hannes Reinecke
2016-07-25  5:56                 ` Hannes Reinecke
2016-07-25 14:45                 ` Jens Axboe
2016-07-24 23:16             ` Damien Le Moal
2016-07-25 14:44             ` Jens Axboe
2016-07-19 13:20 ` Hannes Reinecke [this message]
2016-07-20  1:10   ` [PATCH 5/6] block: Introduce BLKPREP_DONE Damien Le Moal
2016-07-20  1:10     ` Damien Le Moal
2016-07-21  5:58   ` Christoph Hellwig
2016-07-21  6:01     ` Hannes Reinecke
2016-07-21  6:01       ` Hannes Reinecke
2016-07-19 13:20 ` [PATCH 6/6] block: Add 'BLK_MQ_RQ_QUEUE_DONE' return value Hannes Reinecke
2016-07-20  1:11   ` Damien Le Moal
2016-07-20  1:11     ` Damien Le Moal
2016-07-21  5:53   ` Christoph Hellwig
2016-07-21  6:00     ` Hannes Reinecke
2016-07-21  6:00       ` Hannes Reinecke

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1468934439-93579-6-git-send-email-hare@suse.de \
    --to=hare@suse.de \
    --cc=axboe@fb.com \
    --cc=damien.lemoal@hgst.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.