From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: linux-bcache@vger.kernel.org, Chao Yu <yuchao0@huawei.com>, Jan Kara <jack@suse.cz>, Mike Snitzer <snitzer@redhat.com>, linux-mm@kvack.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Jan Kara <jack@suse.com>, Josef Bacik <josef@toxicpanda.com>, Coly Li <colyli@suse.de>, linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, dm-devel@redhat.com, linux-mtd@lists.infradead.org, Johannes Thumshirn <johannes.thumshirn@wdc.com>, Tejun Heo <tj@kernel.org> Subject: [dm-devel] [PATCH 42/44] f2fs: remove a few bd_part checks Date: Thu, 26 Nov 2020 14:04:20 +0100 Message-ID: <20201126130422.92945-43-hch@lst.de> (raw) In-Reply-To: <20201126130422.92945-1-hch@lst.de> bd_part is never NULL for a block device in use by a file system, so remove the checks. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Chao Yu <yuchao0@huawei.com> --- 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 = 0; int i; int cp_payload_blks = __cp_payload(sbi); - struct super_block *sb = sbi->sb; struct curseg_info *seg_i = 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 += data_sum_blocks; /* Record write statistics in the hot node summary */ - kbytes_written = sbi->kbytes_written; - if (sb->s_bdev->bd_part) - kbytes_written += BD_PART_WRITTEN(sbi); + kbytes_written = sbi->kbytes_written + BD_PART_WRITTEN(sbi); seg_i->journal->info.kbytes_written = cpu_to_le64(kbytes_written); 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 = 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 = sbi->sb; int len = 0; - if (!sb->s_bdev->bd_part) - return sprintf(buf, "0\n"); - if (f2fs_sb_has_encrypt(sbi)) len += scnprintf(buf, PAGE_SIZE - len, "%s", "encryption"); -- 2.29.2 -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel
next prev parent reply index Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-26 13:03 [dm-devel] merge struct block_device and struct hd_struct v3 Christoph Hellwig 2020-11-26 13:03 ` [dm-devel] [PATCH 01/44] blk-cgroup: fix a hd_struct leak in blkcg_fill_root_iostats Christoph Hellwig 2020-11-26 13:03 ` [dm-devel] [PATCH 02/44] filemap: consistently use ->f_mapping over ->i_mapping Christoph Hellwig 2020-11-26 13:03 ` [dm-devel] [PATCH 03/44] fs: remove get_super_thawed and get_super_exclusive_thawed Christoph Hellwig 2020-11-26 13:03 ` [dm-devel] [PATCH 04/44] fs: simplify freeze_bdev/thaw_bdev Christoph Hellwig 2020-11-26 14:13 ` Jan Kara 2020-11-26 13:03 ` [dm-devel] [PATCH 05/44] mtip32xx: remove the call to fsync_bdev on removal Christoph Hellwig 2020-11-26 13:03 ` [dm-devel] [PATCH 06/44] zram: do not call set_blocksize Christoph Hellwig 2020-11-26 13:03 ` [dm-devel] [PATCH 07/44] loop: " Christoph Hellwig 2020-11-26 13:03 ` [dm-devel] [PATCH 08/44] dm: simplify flush_bio initialization in __send_empty_flush Christoph Hellwig 2020-11-26 13:03 ` [dm-devel] [PATCH 09/44] dm: remove the block_device reference in struct mapped_device Christoph Hellwig 2020-11-27 10:36 ` Hannes Reinecke 2020-11-26 13:03 ` [dm-devel] [PATCH 10/44] block: remove a duplicate __disk_get_part prototype Christoph Hellwig 2020-11-27 10:36 ` Hannes Reinecke 2020-11-26 13:03 ` [dm-devel] [PATCH 11/44] block: remove a superflous check in blkpg_do_ioctl Christoph Hellwig 2020-11-27 10:37 ` Hannes Reinecke 2020-11-26 13:03 ` [dm-devel] [PATCH 12/44] block: add a bdev_kobj helper Christoph Hellwig 2020-11-26 14:47 ` David Sterba 2020-11-27 12:03 ` Hannes Reinecke 2020-11-26 13:03 ` [dm-devel] [PATCH 13/44] block: use disk_part_iter_exit in disk_part_iter_next Christoph Hellwig 2020-11-27 12:04 ` Hannes Reinecke 2020-11-26 13:03 ` [dm-devel] [PATCH 14/44] block: use put_device in put_disk Christoph Hellwig 2020-11-26 13:03 ` [dm-devel] [PATCH 15/44] block: change the hash used for looking up block devices Christoph Hellwig 2020-11-26 13:03 ` [dm-devel] [PATCH 16/44] init: refactor name_to_dev_t Christoph Hellwig 2020-11-26 13:03 ` [dm-devel] [PATCH 17/44] init: refactor devt_from_partuuid Christoph Hellwig 2020-11-26 13:03 ` [dm-devel] [PATCH 18/44] init: cleanup match_dev_by_uuid and match_dev_by_label Christoph Hellwig 2020-11-26 13:03 ` [dm-devel] [PATCH 19/44] block: refactor __blkdev_put Christoph Hellwig 2020-11-26 13:03 ` [dm-devel] [PATCH 20/44] block: refactor blkdev_get Christoph Hellwig 2020-11-26 14:55 ` Jan Kara 2020-11-26 13:03 ` [dm-devel] [PATCH 21/44] block: move bdput() to the callers of __blkdev_get Christoph Hellwig 2020-11-26 15:05 ` Jan Kara 2020-11-26 13:04 ` [dm-devel] [PATCH 22/44] block: opencode devcgroup_inode_permission Christoph Hellwig 2020-11-26 15:07 ` Jan Kara 2020-11-26 13:04 ` [dm-devel] [PATCH 23/44] block: remove i_bdev Christoph Hellwig 2020-11-26 15:45 ` Jan Kara 2020-11-26 13:04 ` [dm-devel] [PATCH 24/44] block: simplify bdev/disk lookup in blkdev_get Christoph Hellwig 2020-11-26 16:33 ` Jan Kara 2020-11-26 17:42 ` Christoph Hellwig 2020-11-26 13:04 ` [dm-devel] [PATCH 25/44] block: remove ->bd_contains Christoph Hellwig 2020-11-26 13:04 ` [dm-devel] [PATCH 26/44] block: simplify the block device claiming interface Christoph Hellwig 2020-11-26 13:04 ` [dm-devel] [PATCH 27/44] block: simplify part_to_disk Christoph Hellwig 2020-11-26 16:36 ` Jan Kara 2020-11-26 13:04 ` [dm-devel] [PATCH 28/44] block: initialize struct block_device in bdev_alloc Christoph Hellwig 2020-11-26 16:37 ` Jan Kara 2020-11-26 13:04 ` [dm-devel] [PATCH 29/44] block: remove the nr_sects field in struct hd_struct Christoph Hellwig 2020-11-26 16:50 ` Jan Kara 2020-11-26 17:52 ` Christoph Hellwig 2020-11-26 18:04 ` Jan Kara 2020-11-27 9:41 ` Christoph Hellwig 2020-11-26 13:04 ` [dm-devel] [PATCH 30/44] block: move disk stat accounting to struct block_device Christoph Hellwig 2020-11-26 16:53 ` Jan Kara 2020-11-26 13:04 ` [dm-devel] [PATCH 31/44] block: move the start_sect field " Christoph Hellwig 2020-11-26 16:56 ` Jan Kara 2020-11-26 18:02 ` Christoph Hellwig 2020-11-26 13:04 ` [dm-devel] [PATCH 32/44] block: move the partition_meta_info " Christoph Hellwig 2020-11-26 16:58 ` Jan Kara 2020-11-26 13:04 ` [dm-devel] [PATCH 33/44] block: move holder_dir " Christoph Hellwig 2020-11-26 17:00 ` Jan Kara 2020-11-26 13:04 ` [dm-devel] [PATCH 34/44] block: move make_it_fail " Christoph Hellwig 2020-11-26 17:01 ` Jan Kara 2020-11-26 13:04 ` [dm-devel] [PATCH 35/44] block: move the policy field " Christoph Hellwig 2020-11-26 17:03 ` Jan Kara 2020-11-26 13:04 ` [dm-devel] [PATCH 36/44] block: allocate struct hd_struct as part of struct bdev_inode Christoph Hellwig 2020-11-26 17:35 ` Jan Kara 2020-11-26 18:00 ` Jan Kara 2020-11-26 18:02 ` Christoph Hellwig 2020-11-26 13:04 ` [dm-devel] [PATCH 37/44] block: switch partition lookup to use struct block_device Christoph Hellwig 2020-11-26 17:45 ` Jan Kara 2020-11-26 18:22 ` Jan Kara 2020-11-27 9:48 ` Christoph Hellwig 2020-11-27 12:45 ` Jan Kara 2020-11-27 15:36 ` Christoph Hellwig 2020-11-27 17:26 ` Jan Kara 2020-11-26 13:04 ` [dm-devel] [PATCH 38/44] block: remove the partno field from struct hd_struct Christoph Hellwig 2020-11-26 17:46 ` Jan Kara 2020-11-26 13:04 ` [dm-devel] [PATCH 39/44] block: pass a block_device to blk_alloc_devt Christoph Hellwig 2020-11-26 17:47 ` Jan Kara 2020-11-26 13:04 ` [dm-devel] [PATCH 40/44] block: pass a block_device to invalidate_partition Christoph Hellwig 2020-11-26 17:49 ` Jan Kara 2020-11-26 13:04 ` [dm-devel] [PATCH 41/44] block: switch disk_part_iter_* to use a struct block_device Christoph Hellwig 2020-11-27 12:53 ` Jan Kara 2020-11-27 15:24 ` Christoph Hellwig 2020-11-27 17:30 ` Jan Kara 2020-11-26 13:04 ` Christoph Hellwig [this message] 2020-11-26 13:04 ` [dm-devel] [PATCH 43/44] block: merge struct block_device and struct hd_struct Christoph Hellwig 2020-11-27 13:19 ` Jan Kara 2020-11-27 15:47 ` Christoph Hellwig 2020-11-26 13:04 ` [dm-devel] [PATCH 44/44] block: stop using bdget_disk for partition 0 Christoph Hellwig 2020-11-27 13:22 ` Jan Kara
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201126130422.92945-43-hch@lst.de \ --to=hch@lst.de \ --cc=axboe@kernel.dk \ --cc=colyli@suse.de \ --cc=dm-devel@redhat.com \ --cc=gregkh@linuxfoundation.org \ --cc=jack@suse.com \ --cc=jack@suse.cz \ --cc=johannes.thumshirn@wdc.com \ --cc=josef@toxicpanda.com \ --cc=linux-bcache@vger.kernel.org \ --cc=linux-block@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-mtd@lists.infradead.org \ --cc=snitzer@redhat.com \ --cc=tj@kernel.org \ --cc=yuchao0@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
DM-Devel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/dm-devel/0 dm-devel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dm-devel dm-devel/ https://lore.kernel.org/dm-devel \ dm-devel@redhat.com public-inbox-index dm-devel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/com.redhat.dm-devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git