Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2410EC433FE for ; Tue, 8 Dec 2020 16:37:37 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 856B4233CF for ; Tue, 8 Dec 2020 16:37:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 856B4233CF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=56IweCwHmsqfI0O4KU2Jgm2uqEJqVKh2j/DY9uXqZGE=; b=E1J4Jpkhuc5QbZh6YWU5rxUeu eqyk0NkkyigJd+4Yb4lCxGkW7T6odStmh0ZVsDXQLREdWh1nGdmels9/DL52C3IDPm2H7+x5a/Iuo Zp8fRXKmMdnaGeWDd9GXvJSge2rhH1A3fhc9MkknQQKZpYYuWO/IE6RRIkGXcA+YRX6F8sYuD6JbW j0zKpUMcLbb2kr/G3Qaj8F3knaRkW8Z2BwfcKyMvRL4/BxZnWDnDW56CaZbTvl3VgDP0sTfXoFqQT LZ/CNQ55q6R2ycZL2G8XWtvAz2aowqHX48wmgYDymN68lGVo2L0qSImh2QLqOUyy8mOl8OTkF5FD9 u6cW317Gw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kmfzY-0002HH-BX; Tue, 08 Dec 2020 16:37:32 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kmfzL-00029Z-0z for linux-nvme@merlin.infradead.org; Tue, 08 Dec 2020 16:37:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=v4slHGDTT2Sku92ts8Y9y7CGrHZhu+VFefigrYM6LO8=; b=q8qsh046BojX4/WMceI+MqtOU5 kLan7bFMfpJkXWMYs0KHbin2QITMe7hvMpL5IB4YpLG+ju8a9elK0PxytX9qAWOxvZk+E3SJ/tBpw kvfT5n68TmQAp2ClzU4C0aI7yM18Bgit0RecaUOolGKGFJx7q9osA4t1ylQXw+84hUG9XVkA6VJp1 14lHzPo2Zizkg2YEdlBXSRxkqHBswHz3FbXJXBtbWNC//xa6J8n+3bmwhUfnoequauSgr+qv5Lr2H A7s9vR2xrTSVO0X6Na7OyLPpdTdp+KeqvPd87m+ozGkKsQltHOFjgjwU78jCZGmirCDEW+hj1+4LI RgtEWAyA==; Received: from [2001:4bb8:188:f36:7a30:8a2b:aea3:231b] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kmfzJ-0001O6-Oc; Tue, 08 Dec 2020 16:37:18 +0000 From: Christoph Hellwig To: Jens Axboe Subject: [PATCH 5/6] rbd: remove the ->set_read_only method Date: Tue, 8 Dec 2020 17:28:28 +0100 Message-Id: <20201208162829.2424563-6-hch@lst.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201208162829.2424563-1-hch@lst.de> References: <20201208162829.2424563-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sagi Grimberg , Mike Snitzer , Oleksii Kurochko , Dongsheng Yang , linux-block@vger.kernel.org, dm-devel@redhat.com, linux-nvme@lists.infradead.org, "Martin K . Petersen" , Ilya Dryomov , ceph-devel@vger.kernel.org, Hannes Reinecke Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org Now that the hardware read-only state can't be changed by the BLKROSET ioctl, the code in this method is not required anymore. Signed-off-by: Christoph Hellwig Reviewed-by: Hannes Reinecke Acked-by: Ilya Dryomov Reviewed-by: Martin K. Petersen --- drivers/block/rbd.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 2ed79b09439a82..2c64ca15ca079f 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -692,29 +692,10 @@ static void rbd_release(struct gendisk *disk, fmode_t mode) put_device(&rbd_dev->dev); } -static int rbd_set_read_only(struct block_device *bdev, bool ro) -{ - struct rbd_device *rbd_dev = bdev->bd_disk->private_data; - - /* - * Both images mapped read-only and snapshots can't be marked - * read-write. - */ - if (!ro) { - if (rbd_is_ro(rbd_dev)) - return -EROFS; - - rbd_assert(!rbd_is_snap(rbd_dev)); - } - - return 0; -} - static const struct block_device_operations rbd_bd_ops = { .owner = THIS_MODULE, .open = rbd_open, .release = rbd_release, - .set_read_only = rbd_set_read_only, }; /* -- 2.29.2 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme