[4/4] btrfs-progs: rename btrfs_super_block::sectorsize to blocksize

Message ID	587074e50389e226cfb8821b4b7e2d2774f0ec6f.1734324435.git.wqu@suse.com (mailing list archive)
State	New
Headers	show Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9CFC21BD9F6 for <linux-btrfs@vger.kernel.org>; Mon, 16 Dec 2024 04:51:38 +0000 (UTC) From: Qu Wenruo <wqu@suse.com> To: linux-btrfs@vger.kernel.org Subject: [PATCH 4/4] btrfs-progs: rename btrfs_super_block::sectorsize to blocksize Date: Mon, 16 Dec 2024 15:21:07 +1030 Message-ID: <587074e50389e226cfb8821b4b7e2d2774f0ec6f.1734324435.git.wqu@suse.com> In-Reply-To: <cover.1734324435.git.wqu@suse.com> References: <cover.1734324435.git.wqu@suse.com> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	btrfs-progs: rename "sector size" to "block size" \| expand [0/4] btrfs-progs: rename "sector size" to "block size" [1/4] btrfs-progs: convert btrfs_fs_info::sectorsize to blocksize [2/4] btrfs-progs: mkfs: add "--blocksize" option as an alias for "--sectorsize" [3/4] btrfs-progs: docs: change the terminology from "sectorsize" to "blocksize" [4/4] btrfs-progs: rename btrfs_super_block::sectorsize to blocksize

diff --git a/cmds/rescue-chunk-recover.c b/cmds/rescue-chunk-recover.c index 8bbf5b6deb4f..d767915cc415 100644 --- a/cmds/rescue-chunk-recover.c +++ b/cmds/rescue-chunk-recover.c @@ -1471,7 +1471,7 @@ open_ctree_with_broken_chunk(struct recover_control *rc) } UASSERT(!memcmp(disk_super->fsid, rc->fs_devices->fsid, BTRFS_FSID_SIZE)); - fs_info->blocksize = btrfs_super_sectorsize(disk_super); + fs_info->blocksize = btrfs_super_blocksize(disk_super); fs_info->nodesize = btrfs_super_nodesize(disk_super); fs_info->stripesize = btrfs_super_stripesize(disk_super); @@ -1535,7 +1535,7 @@ static int recover_prepare(struct recover_control *rc, const char *path) goto out_close_fd; } - rc->blocksize = btrfs_super_sectorsize(&sb); + rc->blocksize = btrfs_super_blocksize(&sb); rc->nodesize = btrfs_super_nodesize(&sb); rc->generation = btrfs_super_generation(&sb); rc->chunk_root_generation = btrfs_super_chunk_root_generation(&sb); diff --git a/convert/common.c b/convert/common.c index e7bd0309225f..da939a79a840 100644 --- a/convert/common.c +++ b/convert/common.c @@ -143,7 +143,7 @@ static int setup_temp_super(int fd, struct btrfs_mkfs_config *cfg, * and csum tree. */ btrfs_set_super_bytes_used(&super, 6 * cfg->nodesize); - btrfs_set_super_sectorsize(&super, cfg->blocksize); + btrfs_set_super_blocksize(&super, cfg->blocksize); super.__unused_leafsize = cpu_to_le32(cfg->nodesize); btrfs_set_super_nodesize(&super, cfg->nodesize); btrfs_set_super_stripesize(&super, cfg->stripesize); diff --git a/image/image-restore.c b/image/image-restore.c index 667b9811233d..9ab709b8351d 100644 --- a/image/image-restore.c +++ b/image/image-restore.c @@ -365,7 +365,7 @@ static void update_super_old(u8 *buffer) struct btrfs_super_block *super = (struct btrfs_super_block *)buffer; struct btrfs_chunk *chunk; struct btrfs_disk_key *key; - u32 sectorsize = btrfs_super_sectorsize(super); + u32 blocksize = btrfs_super_blocksize(super); u64 flags = btrfs_super_flags(super); if (current_version->extra_sb_flags) @@ -384,9 +384,9 @@ static void update_super_old(u8 *buffer) btrfs_set_stack_chunk_owner(chunk, BTRFS_EXTENT_TREE_OBJECTID); btrfs_set_stack_chunk_stripe_len(chunk, BTRFS_STRIPE_LEN); btrfs_set_stack_chunk_type(chunk, BTRFS_BLOCK_GROUP_SYSTEM); - btrfs_set_stack_chunk_io_align(chunk, sectorsize); - btrfs_set_stack_chunk_io_width(chunk, sectorsize); - btrfs_set_stack_chunk_sector_size(chunk, sectorsize); + btrfs_set_stack_chunk_io_align(chunk, blocksize); + btrfs_set_stack_chunk_io_width(chunk, blocksize); + btrfs_set_stack_chunk_sector_size(chunk, blocksize); btrfs_set_stack_chunk_num_stripes(chunk, 1); btrfs_set_stack_chunk_sub_stripes(chunk, 0); chunk->stripe.devid = super->dev_item.devid; diff --git a/kernel-shared/accessors.h b/kernel-shared/accessors.h index c88041c79c34..94c09b1c9c36 100644 --- a/kernel-shared/accessors.h +++ b/kernel-shared/accessors.h @@ -946,8 +946,8 @@ BTRFS_SETGET_STACK_FUNCS(super_total_bytes, struct btrfs_super_block, total_bytes, 64); BTRFS_SETGET_STACK_FUNCS(super_bytes_used, struct btrfs_super_block, bytes_used, 64); -BTRFS_SETGET_STACK_FUNCS(super_sectorsize, struct btrfs_super_block, - sectorsize, 32); +BTRFS_SETGET_STACK_FUNCS(super_blocksize, struct btrfs_super_block, + blocksize, 32); BTRFS_SETGET_STACK_FUNCS(super_nodesize, struct btrfs_super_block, nodesize, 32); BTRFS_SETGET_STACK_FUNCS(super_stripesize, struct btrfs_super_block, diff --git a/kernel-shared/disk-io.c b/kernel-shared/disk-io.c index c6189697675f..d42ebc519d2e 100644 --- a/kernel-shared/disk-io.c +++ b/kernel-shared/disk-io.c @@ -1587,7 +1587,7 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, struct open_ctree_args *oca ASSERT(!memcmp(disk_super->metadata_uuid, fs_devices->metadata_uuid, BTRFS_FSID_SIZE)); - fs_info->blocksize = btrfs_super_sectorsize(disk_super); + fs_info->blocksize = btrfs_super_blocksize(disk_super); fs_info->nodesize = btrfs_super_nodesize(disk_super); fs_info->stripesize = btrfs_super_stripesize(disk_super); fs_info->csum_type = btrfs_super_csum_type(disk_super); @@ -1816,13 +1816,13 @@ int btrfs_check_super(struct btrfs_super_block *sb, unsigned sbflags) error("nodesize unaligned: %u", btrfs_super_nodesize(sb)); goto error_out; } - if (btrfs_super_sectorsize(sb) < 4096) { + if (btrfs_super_blocksize(sb) < 4096) { error("blocksize too small: %u < 4096", - btrfs_super_sectorsize(sb)); + btrfs_super_blocksize(sb)); goto error_out; } - if (!IS_ALIGNED(btrfs_super_sectorsize(sb), 4096)) { - error("blocksize unaligned: %u", btrfs_super_sectorsize(sb)); + if (!IS_ALIGNED(btrfs_super_blocksize(sb), 4096)) { + error("blocksize unaligned: %u", btrfs_super_blocksize(sb)); goto error_out; } if (btrfs_super_total_bytes(sb) == 0) { @@ -1834,7 +1834,7 @@ int btrfs_check_super(struct btrfs_super_block *sb, unsigned sbflags) goto error_out; } if ((btrfs_super_stripesize(sb) != 4096) - && (btrfs_super_stripesize(sb) != btrfs_super_sectorsize(sb))) { + && (btrfs_super_stripesize(sb) != btrfs_super_blocksize(sb))) { error("invalid stripesize %u", btrfs_super_stripesize(sb)); goto error_out; } diff --git a/kernel-shared/print-tree.c b/kernel-shared/print-tree.c index 09130e97eafe..c1b107d24325 100644 --- a/kernel-shared/print-tree.c +++ b/kernel-shared/print-tree.c @@ -2259,8 +2259,8 @@ void btrfs_print_superblock(struct btrfs_super_block *sb, int full) (unsigned long long)btrfs_super_total_bytes(sb)); printf("bytes_used\t\t%llu\n", (unsigned long long)btrfs_super_bytes_used(sb)); - printf("sectorsize\t\t%llu\n", - (unsigned long long)btrfs_super_sectorsize(sb)); + printf("blocksize\t\t%llu\n", + (unsigned long long)btrfs_super_blocksize(sb)); printf("nodesize\t\t%llu\n", (unsigned long long)btrfs_super_nodesize(sb)); printf("leafsize (deprecated)\t%u\n", diff --git a/kernel-shared/uapi/btrfs_tree.h b/kernel-shared/uapi/btrfs_tree.h index 5720a03c939b..a0388473b9b4 100644 --- a/kernel-shared/uapi/btrfs_tree.h +++ b/kernel-shared/uapi/btrfs_tree.h @@ -256,7 +256,7 @@ * When a block group becomes very fragmented, we convert it to use bitmaps * instead of extents. A free space bitmap is keyed on * (start, FREE_SPACE_BITMAP, length); the corresponding item is a bitmap with - * (length / sectorsize) bits. + * (length / blocksize) bits. */ #define BTRFS_FREE_SPACE_BITMAP_KEY 200 @@ -672,7 +672,7 @@ struct btrfs_super_block { __le64 bytes_used; __le64 root_dir_objectid; __le64 num_devices; - __le32 sectorsize; + __le32 blocksize; __le32 nodesize; __le32 __unused_leafsize; __le32 stripesize; diff --git a/mkfs/common.c b/mkfs/common.c index 10da578d0567..ddcb69ca1aa7 100644 --- a/mkfs/common.c +++ b/mkfs/common.c @@ -458,7 +458,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg) btrfs_set_super_chunk_root(&super, cfg->blocks[MKFS_CHUNK_TREE]); btrfs_set_super_total_bytes(&super, num_bytes); btrfs_set_super_bytes_used(&super, total_used); - btrfs_set_super_sectorsize(&super, cfg->blocksize); + btrfs_set_super_blocksize(&super, cfg->blocksize); super.__unused_leafsize = cpu_to_le32(cfg->nodesize); btrfs_set_super_nodesize(&super, cfg->nodesize); btrfs_set_super_stripesize(&super, cfg->stripesize);

[4/4] btrfs-progs: rename btrfs_super_block::sectorsize to blocksize

Commit Message

Patch