The patchset can be fetched from my github:
https://github.com/adam900710/btrfs-progs/tree/fs_info_refactor
Which is based on v4.11-rc1.
This quite scary patchset does a large refactoring (while still less than
500 LoC) to move sector/node/stripe size members from btrfs_root to
btrfs_fs_info.
(Patch 2~29)
Also, refactor some functions which only uses btrfs_root parameter for
block sizes. (Path 30~32)
Refactored functions are:
1) read_tree_block() in disk-io.c
2) corrupt_keys() in btrfs-corrupt-block.c
3) corrupt_metadata_block() in btrfs-corrupt-block.c
4) read_node_slot() in ctree.c
Such refactoring has already been done in kernel for some time.
I'm pretty sure there are still quite some remaining, but I'd like to
put them after this large patchset get merged.
I have run test-fsck, test-convert (despite the quotation error) and
test-misc. They all finished without problem.
Despite the refactoring, I also synchronized the definition of
btrfs_super_block, to make leafsize deprecated.
(Patch 1)
And less than 3 open-coded round_up are also refactored to round_up()
macro.
Qu Wenruo (32):
btrfs-progs: Remove deprecated leafsize usage
btrfs-progs: Introduce sectorsize nodesize and stripesize members for
btrfs_fs_info
btrfs-progs: Refactor block sizes users in disk-io.c
btrfs-progs: Refactor block sizes users in btrfs-corrupt-block.c
btrfs-progs: Refactor block sizes users in ctree.c and ctree.h
btrfs-progs: Refactor block sizes users in btrfs-map-logical.c
btrfs-progs: Refactor block sizes users in chunk-recover.c
btrfs-progs: Refactor block sizes users in backref.c
btrfs-progs: Refactor block sizes users in cmds-restore.c
btrfs-progs: Refactor nodesize user in extent_io.c
btrfs-progs: Refactor nodesize users in image/main.c
btrfs-progs: Refactor block sizes users in cmds-check.c
btrfs-progs: Refactor nodesize user in btrfstune.c
btrfs-progs: Refactor nodesize users in utils.c
btrfs-progs: Refactor block sizes users in extent-tree.c
btrfs-progs: Refactor nodesize user in print-tree.c
btrfs-progs: Refactor nodesize users in qgroup-verify.c
btrfs-progs: Refactor nodesize users in cmds-inspect-tree-stats.c
btrfs-progs: Refactor sectorsize users in mkfs/main.c
btrfs-progs: Refactor sectorsizes users in file-item.c
btrfs-progs: Refactor sectorsize users in free-space-cache.c
btrfs-progs: Refactor sectorsize users in file.c
btrfs-progs: Refactor sectorsize users in volumes.c
btrfs-progs: Refactor sectorsize users in free-space-tree.c
btrfs-progs: Refactor sectorsize in convert/source-fs.c
btrfs-progs: Refactor sectorsize users in convert/main.c
btrfs-progs: Refactor sectorsize users in convert/source-ext2.c
btrfs-progs: Refactor sectorsize users in cmds-inspect-dump-tree.c
btrfs-progs: Remove block size members in btrfs_root
btrfs-progs: Refactor btrfs_root paramters in btrfs-corrupt-block.c
btrfs-progs: Refactor read_tree_block to get rid of btrfs_root
btrfs-progs: Refactor read_node_slot function to get rid of btrfs_root
parameter
backref.c | 12 ++---
btrfs-corrupt-block.c | 42 ++++++++-------
btrfs-map-logical.c | 4 +-
btrfstune.c | 2 +-
chunk-recover.c | 30 +++++------
cmds-check.c | 130 ++++++++++++++++++++++++----------------------
cmds-inspect-dump-super.c | 4 +-
cmds-inspect-dump-tree.c | 19 ++++---
cmds-inspect-tree-stats.c | 23 ++++----
cmds-restore.c | 18 ++++---
convert/common.c | 2 +-
convert/main.c | 13 ++---
convert/source-ext2.c | 2 +-
convert/source-fs.c | 14 ++---
ctree.c | 45 +++++++++-------
ctree.h | 37 +++----------
disk-io.c | 92 ++++++++++++--------------------
disk-io.h | 14 ++---
extent-tree.c | 38 +++++++-------
extent_io.c | 2 +-
file-item.c | 14 ++---
file.c | 10 ++--
find-root.c | 3 +-
free-space-cache.c | 15 +++---
free-space-tree.c | 4 +-
image/main.c | 17 +++---
mkfs/common.c | 2 +-
mkfs/main.c | 4 +-
print-tree.c | 5 +-
qgroup-verify.c | 6 +--
utils.c | 2 +-
volumes.c | 17 +++---
32 files changed, 306 insertions(+), 336 deletions(-)
--
2.13.0
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
