From mboxrd@z Thu Jan 1 00:00:00 1970 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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 2DE46C83017 for ; Thu, 26 Nov 2020 13:07:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A322C221E9 for ; Thu, 26 Nov 2020 13:07:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="f/NqtmWw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A322C221E9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 080F36B0075; Thu, 26 Nov 2020 08:06:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F1DEF6B007D; Thu, 26 Nov 2020 08:06:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D96DD6B007B; Thu, 26 Nov 2020 08:06:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0115.hostedemail.com [216.40.44.115]) by kanga.kvack.org (Postfix) with ESMTP id C44886B0075 for ; Thu, 26 Nov 2020 08:06:55 -0500 (EST) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 865A31EE6 for ; Thu, 26 Nov 2020 13:06:55 +0000 (UTC) X-FDA: 77526594390.21.fall23_4111b092737f Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id 69D03180442C7 for ; Thu, 26 Nov 2020 13:06:55 +0000 (UTC) X-HE-Tag: fall23_4111b092737f X-Filterd-Recvd-Size: 4224 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Thu, 26 Nov 2020 13:06:54 +0000 (UTC) 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=aX/8uJuUHGL/5OzvkMliljHbjWPWg1zNhllSpoE70RI=; b=f/NqtmWwXz+in+xDMmB5RLjv8a cVt4qBnc4YL+TtpGupRWfcpXZ/6CMSupd9Lm6rDcG1f45gWluVGZPaAXmikFmFovKMbyRSkP3ZBT+ hc6sbcvaUgr/SQB4V48gh+284LgxPRXzht7xX5qdbG0JHflMTnkExFap8GLHZ+7al6WBvVO+ZIGXU yuV9QZKfTfoVvNAS/JM0osWswLlacLPKcjLjBgIVxwI8KvhfrAKHYZ9mvupyLktTioMa2ASs/VYxH bMQUA75QBjhD4AyShZxBO5EeAFqyZ7Z5prC6cKkcC7lpED8A7ZOTzw8QU7NMhM4j/01Ns3IuFxx42 Fx9txkcg==; Received: from [2001:4bb8:18c:1dd6:27b8:b8a1:c13e:ceb1] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kiGyw-0003xL-Ej; Thu, 26 Nov 2020 13:06:42 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Tejun Heo , Josef Bacik , Coly Li , Mike Snitzer , Greg Kroah-Hartman , Jan Kara , Johannes Thumshirn , dm-devel@redhat.com, Jan Kara , linux-block@vger.kernel.org, linux-bcache@vger.kernel.org, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Minchan Kim Subject: [PATCH 06/44] zram: do not call set_blocksize Date: Thu, 26 Nov 2020 14:03:44 +0100 Message-Id: <20201126130422.92945-7-hch@lst.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201126130422.92945-1-hch@lst.de> References: <20201126130422.92945-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 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: set_blocksize is used by file systems to use their preferred buffer cache block size. Block drivers should not set it. Signed-off-by: Christoph Hellwig Acked-by: Minchan Kim --- drivers/block/zram/zram_drv.c | 11 +---------- drivers/block/zram/zram_drv.h | 1 - 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.= c index 6d15d51cee2b7e..b5f68951c9d280 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -403,13 +403,10 @@ static void reset_bdev(struct zram *zram) return; =20 bdev =3D zram->bdev; - if (zram->old_block_size) - set_blocksize(bdev, zram->old_block_size); blkdev_put(bdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL); /* hope filp_close flush all of IO */ filp_close(zram->backing_dev, NULL); zram->backing_dev =3D NULL; - zram->old_block_size =3D 0; zram->bdev =3D NULL; zram->disk->fops =3D &zram_devops; kvfree(zram->bitmap); @@ -454,7 +451,7 @@ static ssize_t backing_dev_store(struct device *dev, struct file *backing_dev =3D NULL; struct inode *inode; struct address_space *mapping; - unsigned int bitmap_sz, old_block_size =3D 0; + unsigned int bitmap_sz; unsigned long nr_pages, *bitmap =3D NULL; struct block_device *bdev =3D NULL; int err; @@ -509,14 +506,8 @@ static ssize_t backing_dev_store(struct device *dev, goto out; } =20 - old_block_size =3D block_size(bdev); - err =3D set_blocksize(bdev, PAGE_SIZE); - if (err) - goto out; - reset_bdev(zram); =20 - zram->old_block_size =3D old_block_size; zram->bdev =3D bdev; zram->backing_dev =3D backing_dev; zram->bitmap =3D bitmap; diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.= h index f2fd46daa76045..712354a4207c77 100644 --- a/drivers/block/zram/zram_drv.h +++ b/drivers/block/zram/zram_drv.h @@ -118,7 +118,6 @@ struct zram { bool wb_limit_enable; u64 bd_wb_limit; struct block_device *bdev; - unsigned int old_block_size; unsigned long *bitmap; unsigned long nr_pages; #endif --=20 2.29.2