diff options
| author | Qu Wenruo <quwenruo@cn.fujitsu.com> | 2017-05-17 16:57:35 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-07-03 13:35:10 +0200 |
| commit | c4893f15cedc59c14656b06b83bb5c8a441efe66 (patch) | |
| tree | 9a3e2335938c09040ebfb081d23b7ef7047fb060 | |
| parent | 3c7a04e59272837b8d70f2cfdfd7173d53c72616 (diff) | |
btrfs-progs: Introduce sectorsize nodesize and stripesize members for
btrfs_fs_info
Just like what we do in kernel, since we will not support different
leaf/node/stripe size per tree, there is no need to store these block
sizes in btrfs_root.
This patch will introduce these block size members into btrfs_fs_info
structure, allowing us to convert such usage in later patches.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
| -rw-r--r-- | chunk-recover.c | 3 | ||||
| -rw-r--r-- | ctree.h | 4 | ||||
| -rw-r--r-- | disk-io.c | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/chunk-recover.c b/chunk-recover.c index cf8b3184..1a880038 100644 --- a/chunk-recover.c +++ b/chunk-recover.c @@ -1475,6 +1475,9 @@ open_ctree_with_broken_chunk(struct recover_control *rc) } memcpy(fs_info->fsid, &disk_super->fsid, BTRFS_FSID_SIZE); + fs_info->sectorsize = btrfs_super_sectorsize(disk_super); + fs_info->nodesize = btrfs_super_nodesize(disk_super); + fs_info->stripesize = btrfs_super_stripesize(disk_super); ret = btrfs_check_fs_compatibility(disk_super, OPEN_CTREE_WRITES); if (ret) @@ -1147,6 +1147,10 @@ struct btrfs_fs_info { struct cache_tree *fsck_extent_cache; struct cache_tree *corrupt_blocks; + /* Cached block sizes */ + u32 nodesize; + u32 sectorsize; + u32 stripesize; }; /* @@ -1327,6 +1327,9 @@ static struct btrfs_fs_info *__open_ctree_fd(int fp, const char *path, } memcpy(fs_info->fsid, &disk_super->fsid, BTRFS_FSID_SIZE); + fs_info->sectorsize = btrfs_super_sectorsize(disk_super); + fs_info->nodesize = btrfs_super_nodesize(disk_super); + fs_info->stripesize = btrfs_super_stripesize(disk_super); ret = btrfs_check_fs_compatibility(fs_info->super_copy, flags); if (ret) |