From patchwork Mon Nov 21 19:00:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaun Tancheff X-Patchwork-Id: 9439945 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 033CB60469 for ; Mon, 21 Nov 2016 19:00:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC02628490 for ; Mon, 21 Nov 2016 19:00:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE23928B27; Mon, 21 Nov 2016 19:00:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5EE128490 for ; Mon, 21 Nov 2016 19:00:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753626AbcKUTAa (ORCPT ); Mon, 21 Nov 2016 14:00:30 -0500 Received: from mail-io0-f193.google.com ([209.85.223.193]:36826 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753075AbcKUTAa (ORCPT ); Mon, 21 Nov 2016 14:00:30 -0500 Received: by mail-io0-f193.google.com with SMTP id k19so7938360iod.3 for ; Mon, 21 Nov 2016 11:00:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=e/OQSNQFpBKKb8o0jBpcPa7H6x4vmAScCEqW2uYin/E=; b=BQkJnlfRWuS5qTxLoWaHwMmQt3OaVydT5piH4l7RUd6tgd996ybmGav5/eyQzfhnF9 U4/3ZcpEZzS/7PwuhnGFZBf+TQDFTb8R9iDbw8bIUctRBFn2TuZF8SjeMh47zHFR+fC5 8cg7Efys0lLG3yXnRf6qMhpUXgJqLBOVNbOejedz4qf+RvjsABbWOnHgplvW2tZloawl ntjgctTCSZ1bfDXCQk/qC/sBsIX4mcg8dfm21tZGV9uJ34uB9k4KGxleeYjPrgYKkm7T DQQnkZTadPXNp431kuxoCJ7wzlGIJ5ePyaG8ANZFM6aL5PRk7fDtwsjjFHWcSrMjC/WT By4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=e/OQSNQFpBKKb8o0jBpcPa7H6x4vmAScCEqW2uYin/E=; b=k71flE0ZddVK5jylQQR0W8XcjbXE/xeDOFCT273tBlbjaM15SB6LST585tzbx9sUFY wQJr5thFRI/PBWoYfMQWrYlUs+9ljGwnDTCxAOGY90Zr6OT06VLbtBiv1PSNBW7tZE96 W++l8TX6fohOooNxpCqxC1w0UIfqOY9ZIoDca5VJtLC4x2skLMRyIGkAfZiTIyvMgemI uqRGuruDUynKqJDR2kykcRS81/V9wVlC6asfA46E84/OjMJhaZNcAPd5ldr53XdhPcQR a5XcuCkxV1/ESy7Y8dP3SST2pgVA+lPHZojxGAi/6+1dvHRE6HrOOfAXx8292pVnq2o3 woBg== X-Gm-Message-State: AKaTC03UBoxdXNQxmpFzCqFxi7fCVttR/emwUmeNYL4Kx2Ue6YP+oH9bDjCvn3+4AQJ7jQ== X-Received: by 10.107.18.208 with SMTP id 77mr12803756ios.195.1479754829454; Mon, 21 Nov 2016 11:00:29 -0800 (PST) Received: from helios.aeonazure.com (173-16-223-93.client.mchsi.com. [173.16.223.93]) by smtp.gmail.com with ESMTPSA id m134sm6430026itb.2.2016.11.21.11.00.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Nov 2016 11:00:28 -0800 (PST) From: Shaun Tancheff To: Jens Axboe Cc: Shaun Tancheff , linux-block@vger.kernel.org, Christoph Hellwig , Damien Le Moal , Hannes Reinecke , Michael T Lombardi , Shaun Tancheff Subject: [PATCH] Apply blk_partition_remap to REQ_OP_ZONE_RESET Date: Mon, 21 Nov 2016 13:00:11 -0600 Message-Id: <20161121190011.13259-1-shaun@tancheff.com> X-Mailer: git-send-email 2.10.2 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When a Reset WP is requested from a partition offset the blk_partition_remap should be applied. Signed-off-by: Shaun Tancheff --- Based on for-4.10/block --- block/blk-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/blk-core.c b/block/blk-core.c index 473dd69..3f85320 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1786,8 +1786,9 @@ static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio) static inline void blk_partition_remap(struct bio *bio) { struct block_device *bdev = bio->bi_bdev; + bool remap = bio_sectors(bio) != 0 || bio_op(bio) == REQ_OP_ZONE_RESET; - if (bio_sectors(bio) && bdev != bdev->bd_contains) { + if (remap && bdev != bdev->bd_contains) { struct hd_struct *p = bdev->bd_part; bio->bi_iter.bi_sector += p->start_sect;