diff options
| author | Qu Wenruo <quwenruo@cn.fujitsu.com> | 2017-05-17 16:42:50 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-07-03 13:35:10 +0200 |
| commit | 3c7a04e59272837b8d70f2cfdfd7173d53c72616 (patch) | |
| tree | 457c3798ce7c3dab868e85e12666ff3dffd56f2a /mkfs | |
| parent | 8f41197b92d711a18e473e326bf576129051b7d5 (diff) | |
btrfs-progs: Remove deprecated leafsize usage
Leafsize is deprecated for a long time, and kernel has already updated
ctree.h to rename sb->leafsize to sb->__unused_leafsize.
This patch will remove normal users of leafsize:
1) Remove leafsize member from btrfs_root structure
Now only root->nodesize and root->sectorisze.
No longer root->leafsize.
2) Remove @leafsize parameter from btrfs_setup_root() function
Since no root->leafsize, no need for @leafsize parameter.
The remaining user of leafsize will be:
1) btrfs inspect-internal dump-super
Reformat the "leafsize" output to "leafsize (deprecated)" and
use le32_to_cpu() to do the cast manually.
2) mkfs
We still need to set sb->__unused_leafsize to nodesize.
Do the manual cast too.
3) convert
Same as mkfs, these two superblock setup should be merged later
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Diffstat (limited to 'mkfs')
| -rw-r--r-- | mkfs/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkfs/common.c b/mkfs/common.c index 1e8f26ea..e4785c58 100644 --- a/mkfs/common.c +++ b/mkfs/common.c @@ -108,7 +108,7 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg) btrfs_set_super_total_bytes(&super, num_bytes); btrfs_set_super_bytes_used(&super, 6 * cfg->nodesize); btrfs_set_super_sectorsize(&super, cfg->sectorsize); - btrfs_set_super_leafsize(&super, cfg->nodesize); + super.__unused_leafsize = cpu_to_le32(cfg->nodesize); btrfs_set_super_nodesize(&super, cfg->nodesize); btrfs_set_super_stripesize(&super, cfg->stripesize); btrfs_set_super_csum_type(&super, BTRFS_CSUM_TYPE_CRC32); |