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.5 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,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 71C56C63777 for ; Sat, 28 Nov 2020 16:33:57 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 086D6246CF for ; Sat, 28 Nov 2020 16:33:56 +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="aBGqqOan" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 086D6246CF 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 E6CD06B0075; Sat, 28 Nov 2020 11:33:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E51266B0078; Sat, 28 Nov 2020 11:33:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D65658D0005; Sat, 28 Nov 2020 11:33:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0074.hostedemail.com [216.40.44.74]) by kanga.kvack.org (Postfix) with ESMTP id BCBFB6B0068 for ; Sat, 28 Nov 2020 11:33:55 -0500 (EST) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 8820C363E for ; Sat, 28 Nov 2020 16:33:55 +0000 (UTC) X-FDA: 77534373630.16.grip96_1600aee27392 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin16.hostedemail.com (Postfix) with ESMTP id 6C27F100E690B for ; Sat, 28 Nov 2020 16:33:55 +0000 (UTC) X-HE-Tag: grip96_1600aee27392 X-Filterd-Recvd-Size: 4290 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf38.hostedemail.com (Postfix) with ESMTP for ; Sat, 28 Nov 2020 16:33: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=3s9ZV7/S/AMqijy+96nJeQSoiw9kLp/J9AYboOAYnhs=; b=aBGqqOanLtlc+/MOQ2guU4f5f3 VNnlTuJV0rDGfpsiZIqhDH+XF/afOtbE8hGuZLqQJKLKXPvdcAgyl/+N4WCkQXr33+Ph3qAWadlB5 PCVyI6FyRNCLN0JDHrpxZFGggUW4g4BHpaP2/wEk9QoBtmjdFq+8wPIwUbaSlUJ6cEns4cQ3rzDmp edXKs6Qyg/5mL/BkRjYNMmVJRgDeEb7t/OTo+GklC7084WagzR45yU3kQUWkdjmC9L5Nw9vkHUGON A0QnT25LwBr4h/xf2svQFf8IcghNabFRV6Vl45t2UBFITOlloWIGSbPAHWPgzT8us2o9pcfs+CuE3 LERJPFFg==; Received: from [2001:4bb8:18c:1dd6:48f3:741a:602e:7fdd] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kj3AR-0001d3-SE; Sat, 28 Nov 2020 16:33:48 +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, Chao Yu Subject: [PATCH 43/45] f2fs: remove a few bd_part checks Date: Sat, 28 Nov 2020 17:15:08 +0100 Message-Id: <20201128161510.347752-44-hch@lst.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201128161510.347752-1-hch@lst.de> References: <20201128161510.347752-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: bd_part is never NULL for a block device in use by a file system, so remove the checks. Signed-off-by: Christoph Hellwig Reviewed-by: Chao Yu --- fs/f2fs/checkpoint.c | 5 +---- fs/f2fs/sysfs.c | 9 --------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index 023462e80e58d5..54a1905af052cc 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -1395,7 +1395,6 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, = struct cp_control *cpc) __u32 crc32 =3D 0; int i; int cp_payload_blks =3D __cp_payload(sbi); - struct super_block *sb =3D sbi->sb; struct curseg_info *seg_i =3D CURSEG_I(sbi, CURSEG_HOT_NODE); u64 kbytes_written; int err; @@ -1489,9 +1488,7 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, = struct cp_control *cpc) start_blk +=3D data_sum_blocks; =20 /* Record write statistics in the hot node summary */ - kbytes_written =3D sbi->kbytes_written; - if (sb->s_bdev->bd_part) - kbytes_written +=3D BD_PART_WRITTEN(sbi); + kbytes_written =3D sbi->kbytes_written + BD_PART_WRITTEN(sbi); =20 seg_i->journal->info.kbytes_written =3D cpu_to_le64(kbytes_written); =20 diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c index ec77ccfea923dc..24e876e849c512 100644 --- a/fs/f2fs/sysfs.c +++ b/fs/f2fs/sysfs.c @@ -90,11 +90,6 @@ static ssize_t free_segments_show(struct f2fs_attr *a, static ssize_t lifetime_write_kbytes_show(struct f2fs_attr *a, struct f2fs_sb_info *sbi, char *buf) { - struct super_block *sb =3D sbi->sb; - - if (!sb->s_bdev->bd_part) - return sprintf(buf, "0\n"); - return sprintf(buf, "%llu\n", (unsigned long long)(sbi->kbytes_written + BD_PART_WRITTEN(sbi))); @@ -103,12 +98,8 @@ static ssize_t lifetime_write_kbytes_show(struct f2fs= _attr *a, static ssize_t features_show(struct f2fs_attr *a, struct f2fs_sb_info *sbi, char *buf) { - struct super_block *sb =3D sbi->sb; int len =3D 0; =20 - if (!sb->s_bdev->bd_part) - return sprintf(buf, "0\n"); - if (f2fs_sb_has_encrypt(sbi)) len +=3D scnprintf(buf, PAGE_SIZE - len, "%s", "encryption"); --=20 2.29.2