From patchwork Fri Jul 31 13:36:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Reinecke X-Patchwork-Id: 6911551 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 282DCC05AD for ; Fri, 31 Jul 2015 13:38:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5225A203B8 for ; Fri, 31 Jul 2015 13:38:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5CA272051D for ; Fri, 31 Jul 2015 13:38:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751978AbbGaNgp (ORCPT ); Fri, 31 Jul 2015 09:36:45 -0400 Received: from mx2.suse.de ([195.135.220.15]:59634 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751302AbbGaNgZ (ORCPT ); Fri, 31 Jul 2015 09:36:25 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 00C5EADB7; Fri, 31 Jul 2015 13:36:21 +0000 (UTC) From: Hannes Reinecke To: James Bottomley Cc: Christoph Hellwig , linux-scsi@vger.kernel.org, Jens Axboe , linux-kernel@vger.kernel.org, Hannes Reinecke Subject: [PATCH 7/8] block: Introduce BLKPREP_DONE Date: Fri, 31 Jul 2015 15:36:19 +0200 Message-Id: <1438349780-116429-8-git-send-email-hare@suse.de> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1438349780-116429-1-git-send-email-hare@suse.de> References: <1438349780-116429-1-git-send-email-hare@suse.de> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add a new blkprep return code BLKPREP_DONE to signal completion without I/O error. Signed-off-by: Hannes Reinecke --- block/blk-core.c | 8 ++++++++ drivers/scsi/scsi_lib.c | 3 ++- include/linux/blkdev.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/block/blk-core.c b/block/blk-core.c index 82d8ce9..ecdfe1a 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -2359,6 +2359,14 @@ struct request *blk_peek_request(struct request_queue *q) */ blk_start_request(rq); __blk_end_request_all(rq, -EIO); + } else if (ret == BLKPREP_DONE) { + 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, 0); } else { printk(KERN_ERR "%s: bad return=%d\n", __func__, ret); break; diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index b1a2631..830a70b 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1342,8 +1342,9 @@ scsi_prep_return(struct request_queue *q, struct request *req, int ret) struct scsi_device *sdev = q->queuedata; switch (ret) { + case BLKPREP_DONE: case BLKPREP_KILL: - req->errors = DID_NO_CONNECT << 16; + req->errors = (ret == BLKPREP_KILL) ? DID_NO_CONNECT << 16 : 0; /* 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 746ea82..86d787d 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -728,6 +728,7 @@ static inline bool blk_write_same_mergeable(struct bio *a, struct bio *b) #define BLKPREP_OK 0 /* serve it */ #define BLKPREP_KILL 1 /* fatal error, kill */ #define BLKPREP_DEFER 2 /* leave on queue */ +#define BLKPREP_DONE 3 /* complete w/o error */ extern unsigned long blk_max_low_pfn, blk_max_pfn;