btrfs: Remove 'objectid' member from struct btrfs_root
There are two members in struct btrfs_root which indicate root's objectid: objectid and root_key.objectid. They are both set to the same value in __setup_root(): static void __setup_root(struct btrfs_root *root, struct btrfs_fs_info *fs_info, u64 objectid) { ... root->objectid = objectid; ... root->root_key.objectid = objecitd; ... } and not changed to other value after initialization. grep in btrfs directory shows both are used in many places: $ grep -rI "root->root_key.objectid" | wc -l 133 $ grep -rI "root->objectid" | wc -l 55 (4.17, inc. some noise) It is confusing to have two similar variable names and it seems that there is no rule about which should be used in a certain case. Since ->root_key itself is needed for tree reloc tree, let's remove 'objecitd' member and unify code to use ->root_key.objectid in all places. Signed-off-by:Misono Tomohiro <misono.tomohiro@jp.fujitsu.com> Reviewed-by:
Qu Wenruo <wqu@suse.com> Reviewed-by:
David Sterba <dsterba@suse.com> Signed-off-by:
David Sterba <dsterba@suse.com>
Showing
- fs/btrfs/backref.c 3 additions, 2 deletionsfs/btrfs/backref.c
- fs/btrfs/btrfs_inode.h 4 additions, 4 deletionsfs/btrfs/btrfs_inode.h
- fs/btrfs/ctree.c 1 addition, 1 deletionfs/btrfs/ctree.c
- fs/btrfs/ctree.h 0 additions, 1 deletionfs/btrfs/ctree.h
- fs/btrfs/delayed-inode.c 3 additions, 2 deletionsfs/btrfs/delayed-inode.c
- fs/btrfs/disk-io.c 2 additions, 3 deletionsfs/btrfs/disk-io.c
- fs/btrfs/export.c 2 additions, 2 deletionsfs/btrfs/export.c
- fs/btrfs/extent-tree.c 1 addition, 1 deletionfs/btrfs/extent-tree.c
- fs/btrfs/inode.c 1 addition, 1 deletionfs/btrfs/inode.c
- fs/btrfs/ioctl.c 1 addition, 1 deletionfs/btrfs/ioctl.c
- fs/btrfs/qgroup.c 12 additions, 11 deletionsfs/btrfs/qgroup.c
- fs/btrfs/ref-verify.c 4 additions, 4 deletionsfs/btrfs/ref-verify.c
- fs/btrfs/relocation.c 2 additions, 1 deletionfs/btrfs/relocation.c
- fs/btrfs/send.c 8 additions, 8 deletionsfs/btrfs/send.c
- fs/btrfs/super.c 4 additions, 2 deletionsfs/btrfs/super.c
- fs/btrfs/transaction.c 2 additions, 2 deletionsfs/btrfs/transaction.c
- include/trace/events/btrfs.h 8 additions, 7 deletionsinclude/trace/events/btrfs.h
Loading
Please register or sign in to comment