btrfs-progs: prep and initial sync of kernel code
Subsystems (2)
PATCH v2 1/18 btrfs-progs: turn on more compiler warnings and use -Wall
In reply to Josef BacikIn converting some of our helpers to take new args I would miss some locations because we don't stop on any warning, and I would miss the warning in the scrollback. Fix this by stopping compiling on any error and turn on the fancy compiler checks.
--- Makefile | 3 +++ 1 file changed, 3 insertions(+)
Makefile +3 -0
@@ -94,6 +94,9 @@ CFLAGS = $(SUBST_CFLAGS) \ -D_XOPEN_SOURCE=700 \ -fno-strict-aliasing \ -fPIC \ + -Wall \ + -Wunused-but-set-parameter \ + -Werror \ -I$(TOPDIR) \ $(CRYPTO_CFLAGS) \ -DCOMPRESSION_LZO=$(COMPRESSION_LZO) \
Signature · 1 line
2.26.3
PATCH v2 2/18 btrfs-progs: properly test for send_stream_version
In reply to Josef BacikWe want to notrun if this test fails, not if it succeeds. Additionally we want -s, as -q will still print an error if it gets ENOENT from the file we're trying to grep.
--- tests/misc-tests/053-receive-write-encoded/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/misc-tests/053-receive-write-encoded/test.sh +1 -1
@@ -11,7 +11,7 @@ check_prereq btrfs setup_root_helper prepare_test_dev -if grep -q '1$' "/sys/fs/btrfs/features/send_stream_version"; then +if ! grep -s '1$' "/sys/fs/btrfs/features/send_stream_version"; then _not_run "kernel does not support send stream >1" exit fi
Signature · 1 line
2.26.3
v2 cover btrfs-progs: prep and initial sync of kernel code
v1->v2:
- Updated a couple other qgroup helpers that I missed.
- Added a macro for KERN_WARNING that I missed.
- A couple of cleanups to enable accessors.[ch] to be sync'ed easier.
- Sync'ing accessors.[ch] as well.
--- Original email ----
Hello,
In order to make my extent tree v2 work easier I need to sync the kernel code into btrfs-progs. We haven't done this in a while, and really I want to move towards doing this every release. Unfortunately because we haven't done this in a while it's going to be a little messy. This is the first patch of patches, which is mostly prep work, and then syncing the easiest parts of the kernel that I could manage.
I've almost got accessors.[ch] done, however it requires doing some cleanups and moving around in the kernel to make it smooth and easy, and I wasn't able to get those done fast enough this week.
I've taken the approach of marking functions that I have to change things with
/*
* MODIFIED:
* - List of things I changed.
*/
Some of these I did because btrfs-progs simply does things differently. Some of these were done because they have dependencies from other things in the kernel sources, and it was simpler to just change it for now, get everything sync'ed, and then go back and clean things up after the fact.
I've tried to make this as painless as possible, but it's just a painful operation. That being said if I've done something in a way that is confusing or just too complicated please point it out to me and I can try alternative strategies. Thanks,
Josef
Josef Bacik (18):
btrfs-progs: turn on more compiler warnings and use -Wall
btrfs-progs: properly test for send_stream_version
btrfs-progs: use -std=gnu11
btrfs-progs: move btrfs_err_str into common/utils.h
btrfs-progs: rename qgroup items to match the kernel naming scheme
btrfs-progs: make btrfs_qgroup_level helper match the kernel
btrfs-progs: move NO_RESULT definition into replace.c
btrfs-progs: rename BLOCK_* to IMAGE_BLOCK_* for metadump
btrfs-progs: rename btrfs_item_end to btrfs_item_data_end
btrfs-progs: sync uapi/btrfs.h into btrfs-progs
btrfs: stop using btrfs_root_item_v0
btrfs-progs: sync ondisk definitions from the kernel
btrfs-progs: sync compression.h from the kernel
btrfs-progs: sync messages.* from the kernel
btrfs-progs: replace btrfs_leaf_data with btrfs_item_nr_offset
btrfs-progs: don't use btrfs_header_csum helper
btrfs-progs: make write_extent_buffer take a const eb
btrfs-progs: sync accessors.[ch] from the kernel
Makefile | 7 +- btrfs-corrupt-block.c | 5 +- btrfs-fragments.c | 2 +- btrfstune.c | 3 +- check/clear-cache.c | 1 + check/main.c | 23 +- check/mode-common.c | 6 +- check/mode-lowmem.c | 8 +- check/qgroup-verify.c | 66 +- cmds/balance.c | 2 +- cmds/device.c | 2 +- cmds/filesystem-du.c | 1 + cmds/filesystem-usage.c | 1 + cmds/filesystem-usage.h | 2 +- cmds/filesystem.c | 3 +- cmds/inspect.c | 2 +- cmds/property.c | 2 +- cmds/qgroup.c | 76 +- cmds/qgroup.h | 10 +- cmds/quota.c | 2 +- cmds/receive.c | 2 +- cmds/replace.c | 5 +- cmds/rescue-chunk-recover.c | 6 +- cmds/rescue.c | 1 + cmds/restore.c | 5 +- cmds/scrub.c | 2 +- cmds/send.c | 2 +- cmds/subvolume-list.c | 7 +- cmds/subvolume.c | 14 +- common/device-scan.c | 2 +- common/device-scan.h | 2 +- common/fsfeatures.c | 2 +- common/parse-utils.c | 1 + common/send-stream.c | 2 +- common/send-utils.c | 2 +- common/units.c | 1 + common/utils.c | 2 +- common/utils.h | 34 +- convert/common.c | 3 +- convert/source-ext2.c | 1 + image/main.c | 53 +- image/metadump.h | 6 +- kerncompat.h | 69 +- kernel-shared/accessors.c | 117 ++ kernel-shared/accessors.h | 1087 ++++++++++ kernel-shared/backref.c | 1 + kernel-shared/compression.h | 184 ++ kernel-shared/ctree.c | 62 +- kernel-shared/ctree.h | 1849 +---------------- kernel-shared/delayed-ref.c | 1 + kernel-shared/dir-item.c | 8 +- kernel-shared/extent_io.c | 5 +- kernel-shared/extent_io.h | 2 +- kernel-shared/file.c | 1 + kernel-shared/free-space-tree.c | 1 + kernel-shared/inode.c | 2 +- kernel-shared/messages.c | 372 ++++ kernel-shared/messages.h | 253 +++ kernel-shared/print-tree.c | 39 +- kernel-shared/transaction.c | 5 - kernel-shared/transaction.h | 1 - ioctl.h => kernel-shared/uapi/btrfs.h | 644 +++--- kernel-shared/uapi/btrfs_tree.h | 1259 +++++++++++ kernel-shared/ulist.c | 1 + kernel-shared/zoned.h | 1 + libbtrfs/ctree.h | 19 +- libbtrfs/send-utils.c | 2 +- libbtrfsutil/btrfs_tree.h | 2 +- mkfs/common.c | 3 +- mkfs/main.c | 1 + tests/ioctl-test.c | 2 +- tests/library-test.c | 2 +- .../053-receive-write-encoded/test.sh | 2 +- 73 files changed, 3984 insertions(+), 2392 deletions(-) create mode 100644 kernel-shared/accessors.c create mode 100644 kernel-shared/accessors.h create mode 100644 kernel-shared/compression.h create mode 100644 kernel-shared/messages.c create mode 100644 kernel-shared/messages.h rename ioctl.h => kernel-shared/uapi/btrfs.h (70%) create mode 100644 kernel-shared/uapi/btrfs_tree.h
Signature · 1 line
2.26.3
PATCH v2 3/18 btrfs-progs: use -std=gnu11
The kernel switched to this recently, switch btrfs-progs to this as well to avoid issues with syncing the kernel code.
--- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
@@ -401,7 +401,7 @@ ifdef C grep -v __SIZE_TYPE__ > $(check_defs)) check = $(CHECKER) check_echo = echo - CSTD = -std=gnu89 + CSTD = -std=gnu11 else check = true check_echo = true
Signature · 1 line
2.26.3
PATCH v2 4/18 btrfs-progs: move btrfs_err_str into common/utils.h
In reply to Josef BacikThis doesn't really belong with the ioctl definitions, and when we sync the ioctl definitions with the kernel this helper will go away, so adjust this now.
--- common/utils.h | 32 ++++++++++++++++++++++++++++++++ ioctl.h | 32 -------------------------------- 2 files changed, 32 insertions(+), 32 deletions(-)
common/utils.h +32 -0
@@ -117,4 +117,36 @@ int sysfs_open_fsid_file(int fd, const char *filename);int sysfs_read_file (int fd,char *buf,size_t size);int sysfs_open_fsid_dir (int fd,const char *dirname); +/* An error code to error string mapping for the kernel +* error codes +*/ +static inline char *btrfs_err_str (enum btrfs_err_code err_code) +{ +switch (err_code) { +case BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET : +return "unable to go below two devices on raid1" ; +case BTRFS_ERROR_DEV_RAID1C3_MIN_NOT_MET : +return "unable to go below three devices on raid1c3" ; +case BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET : +return "unable to go below four devices on raid1c4" ; +case BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET : +return "unable to go below four/two devices on raid10" ; +case BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET : +return "unable to go below two devices on raid5" ; +case BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET : +return "unable to go below three devices on raid6" ; +case BTRFS_ERROR_DEV_TGT_REPLACE : +return "unable to remove the dev_replace target dev" ; +case BTRFS_ERROR_DEV_MISSING_NOT_FOUND : +return "no missing devices found to remove" ; +case BTRFS_ERROR_DEV_ONLY_WRITABLE : +return "unable to remove the only writeable device" ; +case BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS : +return "add/delete/balance/replace/resize operation " +"in progress" ; +default : +return NULL ; + } +} +#endif
ioctl.h +0 -32
@@ -935,38 +935,6 @@ enum btrfs_err_code { BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET, }; -/* An error code to error string mapping for the kernel -* error codes -*/ -static inline char *btrfs_err_str (enum btrfs_err_code err_code) -{ -switch (err_code) { -case BTRFS_ERROR_DEV_RAID1_MIN_NOT_MET : -return "unable to go below two devices on raid1" ; -case BTRFS_ERROR_DEV_RAID1C3_MIN_NOT_MET : -return "unable to go below three devices on raid1c3" ; -case BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET : -return "unable to go below four devices on raid1c4" ; -case BTRFS_ERROR_DEV_RAID10_MIN_NOT_MET : -return "unable to go below four/two devices on raid10" ; -case BTRFS_ERROR_DEV_RAID5_MIN_NOT_MET : -return "unable to go below two devices on raid5" ; -case BTRFS_ERROR_DEV_RAID6_MIN_NOT_MET : -return "unable to go below three devices on raid6" ; -case BTRFS_ERROR_DEV_TGT_REPLACE : -return "unable to remove the dev_replace target dev" ; -case BTRFS_ERROR_DEV_MISSING_NOT_FOUND : -return "no missing devices found to remove" ; -case BTRFS_ERROR_DEV_ONLY_WRITABLE : -return "unable to remove the only writeable device" ; -case BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS : -return "add/delete/balance/replace/resize operation " -"in progress" ; -default : -return NULL ; - } -} -#define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \ struct btrfs_ioctl_vol_args)#define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \
Signature · 1 line
2.26.3
PATCH v2 5/18 btrfs-progs: rename qgroup items to match the kernel naming scheme
In reply to Josef BacikWe're going to sync the kernel source into btrfs-progs, and in the kernel we have all these qgroup fields named with short names instead of the full name, so rename
referenced -> rfer
compressed -> cmpr
exclusive -> excl
to match the kernel and update all the users, this will make the sync cleaner.
--- check/qgroup-verify.c | 60 ++++++++++++++--------------- cmds/qgroup.c | 57 +++++++++++++-------------- cmds/qgroup.h | 8 ++-- cmds/subvolume.c | 12 +++--- ioctl.h | 8 ++-- kernel-shared/ctree.h | 79 +++++++++++++++++++------------------- kernel-shared/print-tree.c | 18 ++++----- 7 files changed, 116 insertions(+), 126 deletions(-)
check/qgroup-verify.c +29 -31
@@ -49,10 +49,10 @@ struct qgroup_count;static struct qgroup_count *find_count (u64 qgroupid);struct qgroup_info { -u64 referenced; -u64 referenced_compressed; -u64 exclusive; -u64 exclusive_compressed; +u64 rfer; +u64 rfer_cmpr; +u64 excl; +u64 excl_cmpr; };struct qgroup_count {
@@ -481,12 +481,12 @@ static int account_one_extent(struct ulist *roots, u64 bytenr, u64 num_bytes) nr_refs =group_get_cur_refcnt (count);if (nr_refs) { - count->info.referenced += num_bytes; - count->info.referenced_compressed += num_bytes; + count->info.rfer += num_bytes; + count->info.rfer_cmpr += num_bytes;if (nr_refs == nr_roots) { - count->info.exclusive += num_bytes; - count->info.exclusive_compressed += num_bytes; + count->info.excl += num_bytes; + count->info.excl_cmpr += num_bytes; } }#ifdef QGROUP_VERIFY_DEBUG
@@ -494,7 +494,7 @@ static int account_one_extent(struct ulist *roots, u64 bytenr, u64 num_bytes)" excl %llu, refs %llu, roots %llu\n" , bytenr, num_bytes,btrfs_qgroup_level (count->qgroupid),btrfs_qgroup_subvid (count->qgroupid), - count->info.referenced, count->info.exclusive, nr_refs, + count->info.rfer, count->info.excl, nr_refs, nr_roots);#endif }
@@ -870,12 +870,10 @@ static struct qgroup_count *alloc_count(struct btrfs_disk_key *key, c->key = *key; item = &c->diskinfo; - item->referenced =btrfs_qgroup_info_referenced (leaf, disk); - item->referenced_compressed = -btrfs_qgroup_info_referenced_compressed (leaf, disk); - item->exclusive =btrfs_qgroup_info_exclusive (leaf, disk); - item->exclusive_compressed = -btrfs_qgroup_info_exclusive_compressed (leaf, disk); + item->rfer =btrfs_qgroup_info_rfer (leaf, disk); + item->rfer_cmpr =btrfs_qgroup_info_rfer_cmpr (leaf, disk); + item->excl =btrfs_qgroup_info_excl (leaf, disk); + item->excl_cmpr =btrfs_qgroup_info_excl_cmpr (leaf, disk);INIT_LIST_HEAD (&c->groups);INIT_LIST_HEAD (&c->members);INIT_LIST_HEAD (&c->bad_list);
@@ -1286,8 +1284,8 @@ static int report_qgroup_difference(struct qgroup_count *count, int verbose)int is_different;struct qgroup_info *info = &count->info;struct qgroup_info *disk = &count->diskinfo; -long long excl_diff = info->exclusive - disk->exclusive; -long long ref_diff = info->referenced - disk->referenced; +long long excl_diff = info->excl - disk->excl; +long long ref_diff = info->rfer - disk->rfer; is_different = excl_diff || ref_diff;
@@ -1297,16 +1295,16 @@ static int report_qgroup_difference(struct qgroup_count *count, int verbose)btrfs_qgroup_subvid (count->qgroupid), is_different ? "are different" : ""); -print_fields (info->referenced, info->referenced_compressed, +print_fields (info->rfer, info->rfer_cmpr,"our:" ,"referenced" ); -print_fields (disk->referenced, disk->referenced_compressed, +print_fields (disk->rfer, disk->rfer_cmpr,"disk:" ,"referenced" );if (ref_diff)print_fields_signed (ref_diff, ref_diff,"diff:" ,"referenced" ); -print_fields (info->exclusive, info->exclusive_compressed, +print_fields (info->excl, info->excl_cmpr,"our:" ,"exclusive" ); -print_fields (disk->exclusive, disk->exclusive_compressed, +print_fields (disk->excl, disk->excl_cmpr,"disk:" ,"exclusive" );if (excl_diff) print_fields_signed(excl_diff, excl_diff,
@@ -1388,8 +1386,8 @@ static bool is_bad_qgroup(struct qgroup_count *count) {struct qgroup_info *info = &count->info;struct qgroup_info *disk = &count->diskinfo; -s64 excl_diff = info->exclusive - disk->exclusive; -s64 ref_diff = info->referenced - disk->referenced; +s64 excl_diff = info->excl - disk->excl; +s64 ref_diff = info->rfer - disk->rfer;return (excl_diff || ref_diff); }
@@ -1594,15 +1592,15 @@ static int repair_qgroup_info(struct btrfs_fs_info *info,btrfs_set_qgroup_info_generation (path.nodes[0 ], info_item, trans->transid); -btrfs_set_qgroup_info_referenced (path.nodes[0 ], info_item, - count->info.referenced); -btrfs_set_qgroup_info_referenced_compressed (path.nodes[0 ], info_item, - count->info.referenced_compressed); +btrfs_set_qgroup_info_rfer (path.nodes[0 ], info_item, + count->info.rfer); +btrfs_set_qgroup_info_rfer_cmpr (path.nodes[0 ], info_item, + count->info.rfer_cmpr); -btrfs_set_qgroup_info_exclusive (path.nodes[0 ], info_item, - count->info.exclusive); -btrfs_set_qgroup_info_exclusive_compressed (path.nodes[0 ], info_item, - count->info.exclusive_compressed); +btrfs_set_qgroup_info_excl (path.nodes[0 ], info_item, + count->info.excl); +btrfs_set_qgroup_info_excl_cmpr (path.nodes[0 ], info_item, + count->info.excl_cmpr);btrfs_mark_buffer_dirty (path.nodes[0 ]);
cmds/qgroup.c +26 -31
144 lines not on this page · raw message
cmds/qgroup.h +4 -4
@@ -24,10 +24,10 @@struct btrfs_qgroup_info {u64 generation; -u64 referenced; -u64 referenced_compressed; -u64 exclusive; -u64 exclusive_compressed; +u64 rfer; +u64 rfer_cmpr; +u64 excl; +u64 excl_cmpr; };struct btrfs_qgroup_stats {
cmds/subvolume.c +6 -6
@@ -1489,15 +1489,15 @@ static int cmd_subvol_show(const struct cmd_struct *cmd, int argc, char **argv)fflush (stdout);pr_verbose (LOG_DEFAULT ,"\t Limit referenced:\t%s\n" , - stats.limit.max_referenced ==0 ?"-" : -pretty_size_mode (stats.limit.max_referenced, unit_mode)); + stats.limit.max_rfer ==0 ?"-" : +pretty_size_mode (stats.limit.max_rfer, unit_mode));pr_verbose (LOG_DEFAULT ,"\t Limit exclusive:\t%s\n" , - stats.limit.max_exclusive ==0 ?"-" : -pretty_size_mode (stats.limit.max_exclusive, unit_mode)); + stats.limit.max_excl ==0 ?"-" : +pretty_size_mode (stats.limit.max_excl, unit_mode));pr_verbose (LOG_DEFAULT ,"\t Usage referenced:\t%s\n" , -pretty_size_mode (stats.info.referenced, unit_mode)); +pretty_size_mode (stats.info.rfer, unit_mode));pr_verbose (LOG_DEFAULT ,"\t Usage exclusive:\t%s\n" , -pretty_size_mode (stats.info.exclusive, unit_mode)); +pretty_size_mode (stats.info.excl, unit_mode)); out:free (subvol_path);
ioctl.h +4 -4
@@ -71,10 +71,10 @@ BUILD_ASSERT(sizeof(struct btrfs_ioctl_vol_args) == 4096);struct btrfs_qgroup_limit {__u64 flags; -__u64 max_referenced; -__u64 max_exclusive; -__u64 rsv_referenced; -__u64 rsv_exclusive; +__u64 max_rfer; +__u64 max_excl; +__u64 rsv_rfer; +__u64 rsv_excl; };BUILD_ASSERT (sizeof (struct btrfs_qgroup_limit ) ==40 );
kernel-shared/ctree.h +39 -40
107 lines not on this page · raw message
kernel-shared/print-tree.c +8 -10
@@ -1088,12 +1088,10 @@ static void print_qgroup_info(struct extent_buffer *eb, int slot)"\t\treferenced %llu referenced_compressed %llu\n" "\t\texclusive %llu exclusive_compressed %llu\n" , (unsigned long long )btrfs_qgroup_info_generation (eb, qg_info), - (unsigned long long )btrfs_qgroup_info_referenced (eb, qg_info), - (unsigned long long )btrfs_qgroup_info_referenced_compressed (eb, - qg_info), - (unsigned long long )btrfs_qgroup_info_exclusive (eb, qg_info), - (unsigned long long )btrfs_qgroup_info_exclusive_compressed (eb, - qg_info)); + (unsigned long long )btrfs_qgroup_info_rfer (eb, qg_info), + (unsigned long long )btrfs_qgroup_info_rfer_cmpr (eb, qg_info), + (unsigned long long )btrfs_qgroup_info_excl (eb, qg_info), + (unsigned long long)btrfs_qgroup_info_excl_cmpr(eb, qg_info)); }static void print_qgroup_limit (struct extent_buffer *eb,int slot)
@@ -1105,10 +1103,10 @@ static void print_qgroup_limit(struct extent_buffer *eb, int slot)"\t\tmax_referenced %lld max_exclusive %lld\n" "\t\trsv_referenced %lld rsv_exclusive %lld\n" , (unsigned long long )btrfs_qgroup_limit_flags (eb, qg_limit), - (long long )btrfs_qgroup_limit_max_referenced (eb, qg_limit), - (long long )btrfs_qgroup_limit_max_exclusive (eb, qg_limit), - (long long )btrfs_qgroup_limit_rsv_referenced (eb, qg_limit), - (long long)btrfs_qgroup_limit_rsv_exclusive(eb, qg_limit)); + (long long )btrfs_qgroup_limit_max_rfer (eb, qg_limit), + (long long )btrfs_qgroup_limit_max_excl (eb, qg_limit), + (long long )btrfs_qgroup_limit_rsv_rfer (eb, qg_limit), + (long long)btrfs_qgroup_limit_rsv_excl(eb, qg_limit)); } static void print_persistent_item(struct extent_buffer *eb, void *ptr,
Signature · 1 line
2.26.3
PATCH v2 6/18 btrfs-progs: make btrfs_qgroup_level helper match the kernel
In reply to Josef BacikWe return __u16 in the kernel, as this is actually the size of btrfs_qgroup_level. Adjust the existing helpers and update all the callers to deal with the new size appropriately. This will make syncing the kernel code cleaner.
--- check/qgroup-verify.c | 6 +++--- cmds/qgroup.c | 16 ++++++++-------- kernel-shared/ctree.h | 2 +- kernel-shared/print-tree.c | 4 ++-- libbtrfs/ctree.h | 2 +- libbtrfsutil/btrfs_tree.h | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-)
check/qgroup-verify.c +3 -3
@@ -1290,7 +1290,7 @@ static int report_qgroup_difference(struct qgroup_count *count, int verbose) is_different = excl_diff || ref_diff;if (verbose || (is_different &&qgroup_printable (count))) { -printf ("Counts for qgroup id: %llu/%llu %s\n" , +printf ("Counts for qgroup id: %u/%llu %s\n" ,btrfs_qgroup_level (count->qgroupid),btrfs_qgroup_subvid (count->qgroupid), is_different ?"are different" :"" );
@@ -1564,7 +1564,7 @@ static int repair_qgroup_info(struct btrfs_fs_info *info,struct btrfs_key key;if (!silent) -printf ("Repair qgroup %llu/%llu\n" , +printf ("Repair qgroup %u/%llu\n" ,btrfs_qgroup_level (count->qgroupid),btrfs_qgroup_subvid (count->qgroupid));
@@ -1578,7 +1578,7 @@ static int repair_qgroup_info(struct btrfs_fs_info *info, key.offset = count->qgroupid; ret =btrfs_search_slot (trans, root, &key, &path,0 ,1 );if (ret) { -error ("could not find disk item for qgroup %llu/%llu" , +error ("could not find disk item for qgroup %u/%llu" ,btrfs_qgroup_level (count->qgroupid),btrfs_qgroup_subvid (count->qgroupid));if (ret >0 )
cmds/qgroup.c +8 -8
@@ -233,7 +233,7 @@ static int print_parent_column(struct btrfs_qgroup *qgroup)int len =0 ;list_for_each_entry (list, &qgroup->qgroups, next_qgroup) { - len +=printf ("%llu/%llu" , + len +=printf ("%u/%llu" ,btrfs_qgroup_level (list->qgroup->qgroupid),btrfs_qgroup_subvid (list->qgroup->qgroupid));if (!list_is_last (&list->next_qgroup, &qgroup->qgroups))
@@ -251,7 +251,7 @@ static int print_child_column(struct btrfs_qgroup *qgroup)int len =0 ;list_for_each_entry (list, &qgroup->members, next_member) { - len +=printf ("%llu/%llu" , + len +=printf ("%u/%llu" ,btrfs_qgroup_level (list->member->qgroupid),btrfs_qgroup_subvid (list->member->qgroupid));if (!list_is_last (&list->next_member, &qgroup->members))
@@ -288,7 +288,7 @@ static void print_qgroup_column(struct btrfs_qgroup *qgroup,switch (column) {case BTRFS_QGROUP_QGROUPID : - len =printf ("%llu/%llu" , + len =printf ("%u/%llu" ,btrfs_qgroup_level (qgroup->qgroupid),btrfs_qgroup_subvid (qgroup->qgroupid));print_qgroup_column_add_blank (BTRFS_QGROUP_QGROUPID , len);
@@ -732,7 +732,7 @@ static int update_qgroup_relation(struct qgroup_lookup *qgroup_lookup, child =qgroup_tree_search (qgroup_lookup, child_id);if (!child) { -error ("cannot find the qgroup %llu/%llu" , +error ("cannot find the qgroup %u/%llu" ,btrfs_qgroup_level (child_id),btrfs_qgroup_subvid (child_id));return -ENOENT ;
@@ -740,7 +740,7 @@ static int update_qgroup_relation(struct qgroup_lookup *qgroup_lookup, parent =qgroup_tree_search (qgroup_lookup, parent_id);if (!parent) { -error ("cannot find the qgroup %llu/%llu" , +error ("cannot find the qgroup %u/%llu" ,btrfs_qgroup_level (parent_id),btrfs_qgroup_subvid (parent_id));return -ENOENT ;
@@ -1001,7 +1001,7 @@ static void __update_columns_max_len(struct btrfs_qgroup *bq,switch (column) {case BTRFS_QGROUP_QGROUPID : -sprintf (tmp,"%llu/%llu" , +sprintf (tmp,"%u/%llu" ,btrfs_qgroup_level (bq->qgroupid),btrfs_qgroup_subvid (bq->qgroupid)); len =strlen (tmp);
@@ -1033,7 +1033,7 @@ static void __update_columns_max_len(struct btrfs_qgroup *bq,case BTRFS_QGROUP_PARENT : len =0 ;list_for_each_entry (list, &bq->qgroups, next_qgroup) { - len +=sprintf (tmp,"%llu/%llu" , + len +=sprintf (tmp,"%u/%llu" ,btrfs_qgroup_level (list->qgroup->qgroupid),btrfs_qgroup_subvid (list->qgroup->qgroupid));if (!list_is_last (&list->next_qgroup, &bq->qgroups))
@@ -1045,7 +1045,7 @@ static void __update_columns_max_len(struct btrfs_qgroup *bq,case BTRFS_QGROUP_CHILD : len =0 ;list_for_each_entry (list, &bq->members, next_member) { - len +=sprintf (tmp,"%llu/%llu" , + len +=sprintf (tmp,"%u/%llu" ,btrfs_qgroup_level (list->member->qgroupid),btrfs_qgroup_subvid (list->member->qgroupid));if (!list_is_last (&list->next_member, &bq->members))
kernel-shared/ctree.h +1 -1
@@ -1071,7 +1071,7 @@ enum btrfs_raid_types {#define BTRFS_QGROUP_LEVEL_SHIFT 48 -static inline u64 btrfs_qgroup_level (u64 qgroupid) +static inline __u16 btrfs_qgroup_level (u64 qgroupid) {return qgroupid >>BTRFS_QGROUP_LEVEL_SHIFT ; }
kernel-shared/print-tree.c +2 -2
@@ -706,7 +706,7 @@ void print_objectid(FILE *stream, u64 objectid, u8 type)fprintf (stream,"%llu" , (unsigned long long )objectid);return ;case BTRFS_QGROUP_RELATION_KEY : -fprintf (stream,"%llu/%llu" ,btrfs_qgroup_level (objectid), +fprintf (stream,"%u/%llu" ,btrfs_qgroup_level (objectid),btrfs_qgroup_subvid (objectid));return ;case BTRFS_UUID_KEY_SUBVOL :
@@ -815,7 +815,7 @@ void btrfs_print_key(struct btrfs_disk_key *disk_key)case BTRFS_QGROUP_RELATION_KEY :case BTRFS_QGROUP_INFO_KEY :case BTRFS_QGROUP_LIMIT_KEY : -printf (" %llu/%llu)" ,btrfs_qgroup_level (offset), +printf (" %u/%llu)" ,btrfs_qgroup_level (offset),btrfs_qgroup_subvid (offset));break ;case BTRFS_UUID_KEY_SUBVOL :
libbtrfs/ctree.h +1 -1
@@ -1104,7 +1104,7 @@ enum btrfs_raid_types {#define BTRFS_QGROUP_LEVEL_SHIFT 48 -static inline u64 btrfs_qgroup_level (u64 qgroupid) +static inline __u16 btrfs_qgroup_level (u64 qgroupid) {return qgroupid >>BTRFS_QGROUP_LEVEL_SHIFT ; }
libbtrfsutil/btrfs_tree.h +1 -1
@@ -908,7 +908,7 @@ struct btrfs_free_space_info {#define BTRFS_FREE_SPACE_USING_BITMAPS (1ULL << 0)#define BTRFS_QGROUP_LEVEL_SHIFT 48 -static __inline____u64 btrfs_qgroup_level (__u64 qgroupid) +static __inline____u16 btrfs_qgroup_level (__u64 qgroupid) {return qgroupid >>BTRFS_QGROUP_LEVEL_SHIFT ; }
Signature · 1 line
2.26.3
PATCH v2 8/18 btrfs-progs: rename BLOCK_* to IMAGE_BLOCK_* for metadump
In reply to Josef BacikWhen we sync the kernel we're going to pull in the fs.h dependency, which defines BLOCK_SIZE/BLOCK_MASK. Avoid this conflict by renaming the image definitions with the IMAGE_ prefix.
--- image/main.c | 42 +++++++++++++++++++++--------------------- image/metadump.h | 6 +++--- 2 files changed, 24 insertions(+), 24 deletions(-)
image/main.c +21 -21
@@ -94,7 +94,7 @@ struct metadump_struct {union {struct meta_cluster cluster; -char meta_cluster_bytes[BLOCK_SIZE ]; +char meta_cluster_bytes[IMAGE_BLOCK_SIZE ]; };pthread_t threads[MAX_WORKER_THREADS ];
@@ -519,7 +519,7 @@ static int metadump_init(struct metadump_struct *md, struct btrfs_root *root,static int write_zero (FILE *out,size_t size) { -static char zero[BLOCK_SIZE ]; +static char zero[IMAGE_BLOCK_SIZE ];return fwrite (zero, size,1 , out); }
@@ -563,14 +563,14 @@ static int write_buffers(struct metadump_struct *md, u64 *next) } header->nritems =cpu_to_le32 (nritems); - ret =fwrite (&md->cluster,BLOCK_SIZE ,1 , md->out); + ret =fwrite (&md->cluster,IMAGE_BLOCK_SIZE ,1 , md->out);if (ret !=1 ) {error ("unable to write out cluster: %m" );return -errno; }/* write buffers */ - bytenr +=le64_to_cpu (header->bytenr) +BLOCK_SIZE ; + bytenr +=le64_to_cpu (header->bytenr) +IMAGE_BLOCK_SIZE ;while (!list_empty (&md->ordered)) { async = list_entry(md->ordered.next, struct async_work, ordered);
@@ -591,8 +591,8 @@ static int write_buffers(struct metadump_struct *md, u64 *next) }/* zero unused space in the last block */ -if (!err && bytenr &BLOCK_MASK ) { -size_t size =BLOCK_SIZE - (bytenr &BLOCK_MASK ); +if (!err && bytenr &IMAGE_BLOCK_MASK ) { +size_t size =IMAGE_BLOCK_SIZE - (bytenr &IMAGE_BLOCK_MASK ); bytenr += size; ret =write_zero (md->out, size);
@@ -1613,7 +1613,7 @@ static void mdrestore_destroy(struct mdrestore_struct *mdres, int num_threads)static int detect_version (FILE *in) {struct meta_cluster *cluster; -u8 buf[BLOCK_SIZE ]; +u8 buf[IMAGE_BLOCK_SIZE ];bool found = false;int i;int ret;
@@ -1622,7 +1622,7 @@ static int detect_version(FILE *in)error ("seek failed: %m" );return -errno; } - ret =fread (buf,BLOCK_SIZE ,1 , in); + ret =fread (buf,IMAGE_BLOCK_SIZE ,1 , in);if (!ret) {error ("failed to read header" );return -EIO ;
@@ -1757,7 +1757,7 @@ static int add_cluster(struct meta_cluster *cluster, mdres->compress_method = header->compress;pthread_mutex_unlock (&mdres->mutex); - bytenr =le64_to_cpu (header->bytenr) +BLOCK_SIZE ; + bytenr =le64_to_cpu (header->bytenr) +IMAGE_BLOCK_SIZE ; nritems =le32_to_cpu (header->nritems);for (i =0 ; i < nritems; i++) { item = &cluster->items[i];
@@ -1799,9 +1799,9 @@ static int add_cluster(struct meta_cluster *cluster,pthread_cond_signal (&mdres->cond);pthread_mutex_unlock (&mdres->mutex); } -if (bytenr &BLOCK_MASK ) { -char buffer[BLOCK_MASK ]; -size_t size =BLOCK_SIZE - (bytenr &BLOCK_MASK ); +if (bytenr &IMAGE_BLOCK_MASK ) { +char buffer[IMAGE_BLOCK_MASK ]; +size_t size =IMAGE_BLOCK_SIZE - (bytenr &IMAGE_BLOCK_MASK ); bytenr += size; ret =fread (buffer, size,1 , mdres->in);
@@ -2011,7 +2011,7 @@ static int search_for_chunk_blocks(struct mdrestore_struct *mdres)u8 *buffer, *tmp =NULL ;int ret =0 ; - cluster =malloc (BLOCK_SIZE ); + cluster =malloc (IMAGE_BLOCK_SIZE );if (!cluster) {error_msg (ERROR_MSG_MEMORY ,NULL );return -ENOMEM ;
@@ -2043,7 +2043,7 @@ static int search_for_chunk_blocks(struct mdrestore_struct *mdres) goto out; } - ret =fread (cluster,BLOCK_SIZE ,1 , mdres->in); + ret =fread (cluster,IMAGE_BLOCK_SIZE ,1 , mdres->in);if (ret ==0 ) {if (feof (mdres->in)) goto out;
@@ -2071,7 +2071,7 @@ static int search_for_chunk_blocks(struct mdrestore_struct *mdres)if (current_cluster > mdres->sys_chunk_end) goto out; - bytenr +=BLOCK_SIZE ; + bytenr +=IMAGE_BLOCK_SIZE ; nritems =le32_to_cpu (header->nritems);/* Search items for tree blocks in sys chunks */
@@ -2139,8 +2139,8 @@ static int search_for_chunk_blocks(struct mdrestore_struct *mdres) } bytenr += bufsize; } -if (bytenr &BLOCK_MASK ) - bytenr +=BLOCK_SIZE - (bytenr &BLOCK_MASK ); +if (bytenr &IMAGE_BLOCK_MASK ) + bytenr +=IMAGE_BLOCK_SIZE - (bytenr &IMAGE_BLOCK_MASK ); current_cluster = bytenr; }
@@ -2251,7 +2251,7 @@ static int build_chunk_tree(struct mdrestore_struct *mdres,if (mdres->in == stdin)return 0 ; - ret =fread (cluster,BLOCK_SIZE ,1 , mdres->in); + ret =fread (cluster,IMAGE_BLOCK_SIZE ,1 , mdres->in);if (ret <=0 ) {error ("unable to read cluster: %m" );return -EIO ;
@@ -2265,7 +2265,7 @@ static int build_chunk_tree(struct mdrestore_struct *mdres,return -EIO ; } - bytenr +=BLOCK_SIZE ; + bytenr +=IMAGE_BLOCK_SIZE ; mdres->compress_method = header->compress; nritems =le32_to_cpu (header->nritems);for (i =0 ; i < nritems; i++) {
@@ -2807,7 +2807,7 @@ static int restore_metadump(const char *input, FILE *out, int old_restore, } } - cluster =malloc (BLOCK_SIZE ); + cluster =malloc (IMAGE_BLOCK_SIZE );if (!cluster) {error_msg (ERROR_MSG_MEMORY ,NULL ); ret = -ENOMEM ;
@@ -2837,7 +2837,7 @@ static int restore_metadump(const char *input, FILE *out, int old_restore, }while (!mdrestore.error) { - ret =fread (cluster,BLOCK_SIZE ,1 , in); + ret =fread (cluster,IMAGE_BLOCK_SIZE ,1 , in);if (!ret)break ;
image/metadump.h +3 -3
@@ -22,10 +22,10 @@#include "kernel-lib/list.h" #include "kernel-shared/ctree.h" -#define BLOCK_SIZE SZ_1K -#define BLOCK_MASK (BLOCK_SIZE - 1) +#define IMAGE_BLOCK_SIZE SZ_1K +#define IMAGE_BLOCK_MASK (IMAGE_BLOCK_SIZE - 1) -#define ITEMS_PER_CLUSTER ((BLOCK_SIZE - sizeof(struct meta_cluster)) / \ +#define ITEMS_PER_CLUSTER ((IMAGE_BLOCK_SIZE - sizeof(struct meta_cluster)) / \ sizeof(struct meta_cluster_item))#define COMPRESS_NONE 0
Signature · 1 line
2.26.3
PATCH v2 7/18 btrfs-progs: move NO_RESULT definition into replace.c
In reply to Josef BacikBTRFS_IOCTL_DEV_REPLACE_RESULT_NO_RESULT is defined to make sure we differentiate internal errors from actual error codes that come back from the device replace ioctl. Take this out of ioctl.c and move it into replace.c.
--- cmds/replace.c | 2 ++ ioctl.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)
cmds/replace.c +2 -0
@@ -45,6 +45,8 @@ static int print_replace_status(int fd, const char *path, int once);static char *time2string (char *buf,size_t s,__u64 t);static char *progress2string (char *buf,size_t s,int progress_1000); +/* Used to separate internal errors from actual dev replace ioctl results. */ +#define BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_RESULT -1static const char *replace_dev_result2string (__u64 result) {
ioctl.h +0 -1
@@ -192,7 +192,6 @@ BUILD_ASSERT(sizeof(struct btrfs_ioctl_dev_replace_status_params) == 48);#define BTRFS_IOCTL_DEV_REPLACE_CMD_START 0#define BTRFS_IOCTL_DEV_REPLACE_CMD_STATUS 1#define BTRFS_IOCTL_DEV_REPLACE_CMD_CANCEL 2 -#define BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_RESULT -1#define BTRFS_IOCTL_DEV_REPLACE_RESULT_NO_ERROR 0#define BTRFS_IOCTL_DEV_REPLACE_RESULT_NOT_STARTED 1#define BTRFS_IOCTL_DEV_REPLACE_RESULT_ALREADY_STARTED 2
Signature · 1 line
2.26.3
PATCH v2 9/18 btrfs-progs: rename btrfs_item_end to btrfs_item_data_end
In reply to Josef BacikThis matches what we did in the kernel, btrfs_item_data_end is more inline with what the helper does, which is give us the offset of the end of the data portion of the item, not the offset of the end of the item itself.
--- check/main.c | 12 ++++++------ kernel-shared/ctree.c | 12 ++++++------ kernel-shared/ctree.h | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-)
check/main.c +6 -6
@@ -4393,9 +4393,9 @@ again:for (i =0 ; i <btrfs_header_nritems (buf); i++) {unsigned int shift =0 , offset; -if (i ==0 &&btrfs_item_end (buf, i) != +if (i ==0 &&btrfs_item_data_end (buf, i) !=BTRFS_LEAF_DATA_SIZE (gfs_info)) { -if (btrfs_item_end (buf, i) > +if (btrfs_item_data_end (buf, i) >BTRFS_LEAF_DATA_SIZE (gfs_info)) { ret =delete_bogus_item (root, path, buf, i);if (!ret)
@@ -4406,10 +4406,10 @@ again:break ; } shift =BTRFS_LEAF_DATA_SIZE (gfs_info) - -btrfs_item_end (buf, i); - }else if (i >0 &&btrfs_item_end (buf, i) != +btrfs_item_data_end (buf, i); + }else if (i >0 &&btrfs_item_data_end (buf, i) !=btrfs_item_offset (buf, i -1 )) { -if (btrfs_item_end (buf, i) > +if (btrfs_item_data_end (buf, i) >btrfs_item_offset (buf, i -1 )) { ret =delete_bogus_item (root, path, buf, i);if (!ret)
@@ -4419,7 +4419,7 @@ again:break ; } shift =btrfs_item_offset (buf, i -1 ) - -btrfs_item_end (buf, i); +btrfs_item_data_end (buf, i); }if (!shift)continue ;
kernel-shared/ctree.c +6 -6
@@ -1938,7 +1938,7 @@ static int leaf_space_used(struct extent_buffer *l, int start, int nr)if (!nr)return 0 ; - data_len =btrfs_item_end (l, start); + data_len =btrfs_item_data_end (l, start); data_len = data_len -btrfs_item_offset (l, end); data_len +=sizeof (struct btrfs_item ) * nr;WARN_ON (data_len <0 );
@@ -2066,7 +2066,7 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root/* push left to right */ right_nritems =btrfs_header_nritems (right); - push_space =btrfs_item_end (left, left_nritems - push_items); + push_space =btrfs_item_data_end (left, left_nritems - push_items); push_space -=leaf_data_end (left);/* make room in the right data area */
@@ -2301,7 +2301,7 @@ static noinline int copy_for_split(struct btrfs_trans_handle *trans, nritems = nritems - mid;btrfs_set_header_nritems (right, nritems); - data_copy_size =btrfs_item_end (l, mid) -leaf_data_end (l); + data_copy_size =btrfs_item_data_end (l, mid) -leaf_data_end (l); copy_extent_buffer(right, l, btrfs_leaf_data(right), btrfs_item_nr_offset(l, mid),
@@ -2313,7 +2313,7 @@ static noinline int copy_for_split(struct btrfs_trans_handle *trans, btrfs_leaf_data(l) + leaf_data_end(l), data_copy_size); rt_data_off =BTRFS_LEAF_DATA_SIZE (root->fs_info) - -btrfs_item_end (l, mid); +btrfs_item_data_end (l, mid);for (i =0 ; i < nritems; i++) {u32 ioff =btrfs_item_offset (right, i);
@@ -2734,7 +2734,7 @@ int btrfs_extend_item(struct btrfs_root *root, struct btrfs_path *path,BUG (); } slot = path->slots[0 ]; - old_data =btrfs_item_end (leaf, slot); + old_data =btrfs_item_data_end (leaf, slot);BUG_ON (slot <0 );if (slot >= nritems) {
@@ -2823,7 +2823,7 @@ int btrfs_insert_empty_items(struct btrfs_trans_handle *trans,BUG_ON (slot <0 );if (slot < nritems) { -unsigned int old_data =btrfs_item_end (leaf, slot); +unsigned int old_data =btrfs_item_data_end (leaf, slot);if (old_data < data_end) {btrfs_print_leaf (leaf,BTRFS_PRINT_TREE_DEFAULT );
kernel-shared/ctree.h +1 -1
@@ -2022,7 +2022,7 @@ static inline void btrfs_set_item_##member(struct extent_buffer *eb, \ BTRFS_ITEM_SETGET_FUNCS(size) BTRFS_ITEM_SETGET_FUNCS(offset) -static inline u32 btrfs_item_end(struct extent_buffer *eb, int nr) +static inline u32 btrfs_item_data_end(struct extent_buffer *eb, int nr) { return btrfs_item_offset(eb, nr) + btrfs_item_size(eb, nr); }
Signature · 1 line
2.26.3
PATCH v2 10/18 btrfs-progs: sync uapi/btrfs.h into btrfs-progs
In reply to Josef BacikWe want to keep this file locally as we want to be uptodate with upstream, so we can build btrfs-progs regardless of which kernel is currently installed. Sync this with the upstream version and put it in kernel-shared/uapi to maintain some semblance of where this file comes from.
--- btrfs-fragments.c | 2 +- btrfstune.c | 2 +- check/main.c | 2 +- cmds/balance.c | 2 +- cmds/device.c | 2 +- cmds/filesystem-usage.h | 2 +- cmds/filesystem.c | 2 +- cmds/inspect.c | 2 +- cmds/property.c | 2 +- cmds/qgroup.c | 2 +- cmds/qgroup.h | 2 +- cmds/quota.c | 2 +- cmds/receive.c | 2 +- cmds/replace.c | 2 +- cmds/rescue-chunk-recover.c | 2 +- cmds/scrub.c | 2 +- cmds/send.c | 2 +- cmds/subvolume-list.c | 2 +- cmds/subvolume.c | 2 +- common/device-scan.c | 2 +- common/device-scan.h | 2 +- common/fsfeatures.c | 2 +- common/send-stream.c | 2 +- common/send-utils.c | 2 +- common/utils.c | 2 +- common/utils.h | 2 +- convert/common.c | 2 +- image/main.c | 2 +- kernel-shared/ctree.h | 2 +- ioctl.h => kernel-shared/uapi/btrfs.h | 603 +++++++++++++++----------- libbtrfs/ctree.h | 2 +- libbtrfs/send-utils.c | 2 +- mkfs/common.c | 2 +- tests/ioctl-test.c | 2 +- tests/library-test.c | 2 +- 35 files changed, 373 insertions(+), 298 deletions(-) rename ioctl.h => kernel-shared/uapi/btrfs.h (70%)
btrfs-fragments.c +1 -1
@@ -31,7 +31,7 @@#include <gd.h> #include "kernel-shared/ctree.h" #include "common/utils.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" static int use_color; static void
btrfstune.c +1 -1
@@ -41,7 +41,7 @@#include "common/string-utils.h" #include "common/help.h" #include "common/box.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" static char *device;static int force =0 ;
check/main.c +1 -1
@@ -61,7 +61,7 @@#include "check/mode-lowmem.h" #include "check/qgroup-verify.h" #include "check/clear-cache.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" /* Global context variables */ struct btrfs_fs_info *gfs_info;
cmds/balance.c +1 -1
@@ -33,7 +33,7 @@#include "common/messages.h" #include "common/help.h" #include "cmds/commands.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" static const char *const balance_cmd_group_usage[] = {"btrfs balance <command> [options] <path>" ,
cmds/device.c +1 -1
@@ -41,7 +41,7 @@#include "cmds/commands.h" #include "cmds/filesystem-usage.h" #include "mkfs/common.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" static const char *const device_cmd_group_usage[] = {"btrfs device <command> [<args>]" ,
cmds/filesystem-usage.h +1 -1
@@ -20,7 +20,7 @@#define __CMDS_FI_USAGE_H__#include "kerncompat.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" struct device_info {u64 devid;
cmds/filesystem.c +1 -1
@@ -53,7 +53,7 @@#include "common/filesystem-utils.h" #include "cmds/commands.h" #include "cmds/filesystem-usage.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" /* * for btrfs fi show, we maintain a hash of fsids we've already printed.
cmds/inspect.c +1 -1
@@ -36,7 +36,7 @@#include "common/units.h" #include "common/string-utils.h" #include "cmds/commands.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" static const char *const inspect_cmd_group_usage[] = {"btrfs inspect-internal <command> <args>" ,
cmds/property.c +1 -1
@@ -38,7 +38,7 @@#include "common/filesystem-utils.h" #include "cmds/commands.h" #include "cmds/props.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" #define XATTR_BTRFS_PREFIX "btrfs."#define XATTR_BTRFS_PREFIX_LEN (sizeof(XATTR_BTRFS_PREFIX) - 1)
cmds/qgroup.c +1 -1
@@ -38,7 +38,7 @@#include "common/messages.h" #include "cmds/commands.h" #include "cmds/qgroup.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" #define BTRFS_QGROUP_NFILTERS_INCREASE (2 * BTRFS_QGROUP_FILTER_MAX)#define BTRFS_QGROUP_NCOMPS_INCREASE (2 * BTRFS_QGROUP_COMP_MAX)
cmds/qgroup.h +1 -1
@@ -20,7 +20,7 @@#define __CMDS_QGROUP_H__#include "kerncompat.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" struct btrfs_qgroup_info {u64 generation;
cmds/quota.c +1 -1
@@ -27,7 +27,7 @@#include "common/open-utils.h" #include "common/messages.h" #include "cmds/commands.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" static const char *const quota_cmd_group_usage[] = {"btrfs quota <command> [options] <path>" ,
cmds/receive.c +1 -1
@@ -55,7 +55,7 @@#include "common/string-utils.h" #include "cmds/commands.h" #include "cmds/receive-dump.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" struct btrfs_receive {
cmds/replace.c +1 -1
@@ -39,7 +39,7 @@#include "common/messages.h" #include "cmds/commands.h" #include "mkfs/common.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" static int print_replace_status (int fd,const char *path,int once);static char *time2string (char *buf,size_t s,__u64 t);
cmds/rescue-chunk-recover.c +1 -1
@@ -37,7 +37,7 @@#include "common/utils.h" #include "cmds/rescue.h" #include "check/common.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" struct recover_control {int verbose;
cmds/scrub.c +1 -1
@@ -51,7 +51,7 @@#include "common/units.h" #include "common/help.h" #include "cmds/commands.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" static unsigned unit_mode =UNITS_DEFAULT ;
cmds/send.c +1 -1
@@ -35,7 +35,7 @@#include "common/string-utils.h" #include "common/messages.h" #include "cmds/commands.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" #define BTRFS_SEND_BUF_SIZE_V1 (SZ_64K)#define BTRFS_MAX_COMPRESSED (SZ_128K)
cmds/subvolume-list.c +1 -1
@@ -35,7 +35,7 @@#include "common/string-utils.h" #include "common/utils.h" #include "cmds/commands.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" /* * Naming of options:
cmds/subvolume.c +1 -1
@@ -42,7 +42,7 @@#include "common/units.h" #include "cmds/commands.h" #include "cmds/qgroup.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" static int wait_for_subvolume_cleaning (int fd,size_t count,uint64_t *ids,int sleep_interval)
common/device-scan.c +1 -1
@@ -50,7 +50,7 @@#include "common/defs.h" #include "common/open-utils.h" #include "common/units.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" static int btrfs_scan_done =0 ;
common/device-scan.h +1 -1
@@ -19,7 +19,7 @@#include "kerncompat.h" #include <dirent.h> -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" #define BTRFS_SCAN_MOUNTED (1ULL << 0)#define BTRFS_SCAN_LBLKID (1ULL << 1)
common/fsfeatures.c +1 -1
@@ -29,7 +29,7 @@#include "common/string-utils.h" #include "common/utils.h" #include "common/messages.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" /* * Insert a root item for temporary tree root
common/send-stream.c +1 -1
@@ -26,7 +26,7 @@#include "crypto/crc32c.h" #include "common/send-stream.h" #include "common/messages.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" struct btrfs_send_attribute {u16 tlv_type;
common/send-utils.c +1 -1
@@ -28,7 +28,7 @@#include "common/send-utils.h" #include "common/messages.h" #include "common/utils.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" static int btrfs_subvolid_resolve_sub (int fd,char *path,size_t *path_len,u64 subvol_id);
common/utils.c +1 -1
@@ -38,7 +38,7 @@#include "common/messages.h" #include "cmds/commands.h" #include "mkfs/common.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" static int rand_seed_initialized =0 ;static unsigned short rand_seed[3 ];
common/utils.h +1 -1
@@ -29,7 +29,7 @@#include "common/internal.h" #include "common/messages.h" #include "common/fsfeatures.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" enum exclusive_operation {BTRFS_EXCLOP_NONE ,
convert/common.c +1 -1
@@ -29,7 +29,7 @@#include "common/messages.h" #include "mkfs/common.h" #include "convert/common.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" #define BTRFS_CONVERT_META_GROUP_SIZE SZ_32M
image/main.c +1 -1
@@ -51,7 +51,7 @@#include "common/string-utils.h" #include "image/metadump.h" #include "image/sanitize.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" #define MAX_WORKER_THREADS (32)
kernel-shared/ctree.h +1 -1
@@ -25,7 +25,7 @@#include "kerncompat.h" #include "common/extent-cache.h" #include "kernel-shared/extent_io.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" struct btrfs_root ;struct btrfs_trans_handle ;
kernel-shared/uapi/btrfs.h renamed from ioctl.h +339 -264
950 lines not on this page · raw message
libbtrfs/ctree.h +1 -1
@@ -25,7 +25,7 @@#include "kernel-lib/list.h" #include "kernel-lib/rbtree.h" #include "kerncompat.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" #else #include <btrfs/list.h> #include <btrfs/rbtree.h>
libbtrfs/send-utils.c +1 -1
@@ -27,7 +27,7 @@#include "kernel-lib/rbtree.h" #include "libbtrfs/ctree.h" #include "libbtrfs/send-utils.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" static int btrfs_subvolid_resolve_sub (int fd,char *path,size_t *path_len,u64 subvol_id);
mkfs/common.c +1 -1
@@ -38,7 +38,7 @@#include "common/device-utils.h" #include "common/open-utils.h" #include "mkfs/common.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" static u64 reference_root_table[] = { [MKFS_ROOT_TREE ] =BTRFS_ROOT_TREE_OBJECTID ,
tests/ioctl-test.c +1 -1
@@ -18,7 +18,7 @@#include <stdio.h> #include <stdlib.h> -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" #include "kernel-shared/ctree.h" #define LIST_32_COMPAT \
tests/library-test.c +1 -1
@@ -22,7 +22,7 @@#include "kernel-lib/rbtree.h" #include "kernel-lib/list.h" #include "kernel-shared/ctree.h" -#include "ioctl.h" +#include "kernel-shared/uapi/btrfs.h" #include "kernel-shared/send.h" #include "common/send-stream.h" #include "common/send-utils.h"
Signature · 1 line
2.26.3
PATCH v2 13/18 btrfs-progs: sync compression.h from the kernel
In reply to Josef BacikThis patch copies in compression.h from the kernel. This is relatively straightforward, we just have to drop the compression types definition from ctree.h, and update the image to use BTRFS_NR_COMPRESS_TYPES instead of BTRFS_COMPRESS_LAST, and add a few things to kerncompat.h to make everything build smoothly.
--- check/mode-common.c | 1 + check/mode-lowmem.c | 1 + cmds/filesystem.c | 1 + cmds/restore.c | 3 +- common/parse-utils.c | 1 + kerncompat.h | 21 ++++ kernel-shared/compression.h | 184 ++++++++++++++++++++++++++++++++++++ kernel-shared/ctree.h | 9 -- kernel-shared/file.c | 1 + kernel-shared/print-tree.c | 1 + 10 files changed, 213 insertions(+), 10 deletions(-) create mode 100644 kernel-shared/compression.h
check/mode-common.c +1 -0
@@ -27,6 +27,7 @@#include "kernel-shared/disk-io.h" #include "kernel-shared/volumes.h" #include "kernel-shared/backref.h" +#include "kernel-shared/compression.h" #include "common/internal.h" #include "common/messages.h" #include "common/utils.h"
check/mode-lowmem.c +1 -0
@@ -28,6 +28,7 @@#include "kernel-shared/transaction.h" #include "kernel-shared/disk-io.h" #include "kernel-shared/backref.h" +#include "kernel-shared/compression.h" #include "kernel-shared/volumes.h" #include "common/messages.h" #include "common/internal.h"
cmds/filesystem.c +1 -0
@@ -35,6 +35,7 @@#include "kernel-lib/list.h" #include "kernel-lib/sizes.h" #include "kernel-shared/ctree.h" +#include "kernel-shared/compression.h" #include "kernel-shared/volumes.h" #include "kernel-lib/list_sort.h" #include "kernel-shared/disk-io.h"
cmds/restore.c +2 -1
@@ -43,6 +43,7 @@#include "kernel-shared/print-tree.h" #include "kernel-shared/volumes.h" #include "kernel-shared/extent_io.h" +#include "kernel-shared/compression.h" #include "common/utils.h" #include "common/help.h" #include "common/open-utils.h"
@@ -718,7 +719,7 @@ static int copy_file(struct btrfs_root *root, int fd, struct btrfs_key *key, struct btrfs_file_extent_item); extent_type =btrfs_file_extent_type (leaf, fi); compression =btrfs_file_extent_compression (leaf, fi); -if (compression >=BTRFS_COMPRESS_LAST ) { +if (compression >=BTRFS_NR_COMPRESS_TYPES ) {warning ("compression type %d not supported" , compression); ret =-1 ;
common/parse-utils.c +1 -0
@@ -25,6 +25,7 @@#include <strings.h> #include "libbtrfsutil/btrfsutil.h" #include "kernel-shared/volumes.h" +#include "kernel-shared/compression.h" #include "common/parse-utils.h" #include "common/messages.h" #include "common/utils.h"
kerncompat.h +21 -0
@@ -192,6 +192,10 @@ struct mutex {unsigned long lock; }; +typedef struct spinlock_struct { +unsigned long lock; +}spinlock_t ; +#define mutex_init (m) \ do { \ (m)->lock = 1; \
@@ -550,4 +554,21 @@ do { \ (x) = (val); \ } while (0) +typedef struct refcount_struct { +int refs; +} refcount_t; + +typedef u32 blk_status_t ; +typedef u32 blk_opf_t ; +typedef int atomic_t ; + +struct work_struct { +}; + +typedef struct wait_queue_head_s { +}wait_queue_head_t ; + +#define __init +#define __cold +#endif
kernel-shared/compression.h new file +184 -0
184 lines not on this page · raw message
kernel-shared/ctree.h +0 -9
@@ -149,15 +149,6 @@ struct btrfs_path { sizeof(struct btrfs_item))#define BTRFS_MAX_EXTENT_SIZE 128UL * 1024 * 1024 -typedef enum { -BTRFS_COMPRESS_NONE =0 , -BTRFS_COMPRESS_ZLIB =1 , -BTRFS_COMPRESS_LZO =2 , -BTRFS_COMPRESS_ZSTD =3 , -BTRFS_COMPRESS_TYPES =3 , -BTRFS_COMPRESS_LAST =4 , -}btrfs_compression_type ; -enum btrfs_tree_block_status {BTRFS_TREE_BLOCK_CLEAN ,BTRFS_TREE_BLOCK_INVALID_NRITEMS ,
kernel-shared/file.c +1 -0
@@ -21,6 +21,7 @@#include "common/utils.h" #include "kernel-shared/disk-io.h" #include "kernel-shared/transaction.h" +#include "compression.h" #include "kerncompat.h" /*
kernel-shared/print-tree.c +1 -0
@@ -25,6 +25,7 @@#include "kernel-shared/disk-io.h" #include "kernel-shared/print-tree.h" #include "kernel-shared/volumes.h" +#include "kernel-shared/compression.h" #include "common/utils.h" static void print_dir_item_type(struct extent_buffer *eb,
Signature · 1 line
2.26.3
PATCH v2 12/18 btrfs-progs: sync ondisk definitions from the kernel
In reply to Josef BacikThis pulls in the kernel's btrfs_tree.h, which now has all of the ondisk definitions. Include this into ctree.h, and then yank out all the duplicate code from ctree.h.
--- kernel-shared/ctree.h | 950 +---------------------- kernel-shared/uapi/btrfs_tree.h | 1259 +++++++++++++++++++++++++++++++ 2 files changed, 1260 insertions(+), 949 deletions(-) create mode 100644 kernel-shared/uapi/btrfs_tree.h
kernel-shared/ctree.h +1 -949
@@ -26,11 +26,11 @@#include "common/extent-cache.h" #include "kernel-shared/extent_io.h" #include "kernel-shared/uapi/btrfs.h" +#include "kernel-shared/uapi/btrfs_tree.h" struct btrfs_root ;struct btrfs_trans_handle ;struct btrfs_free_space_ctl ; -#define BTRFS_MAGIC 0x4D5F53665248425FULL/* ascii _BHRfS_M, no null */ /* * Fake signature for an unfinalized filesystem, which only has barebone tree
@@ -42,272 +42,10 @@ struct btrfs_free_space_ctl;#define BTRFS_MAX_MIRRORS 3 -#define BTRFS_MAX_LEVEL 8 - -/* holds pointers to all of the tree roots */ -#define BTRFS_ROOT_TREE_OBJECTID 1ULL - -/* stores information about which extents are in use, and reference counts */ -#define BTRFS_EXTENT_TREE_OBJECTID 2ULL - -/* -* chunk tree stores translations from logical -> physical block numbering -* the super block points to the chunk tree -*/ -#define BTRFS_CHUNK_TREE_OBJECTID 3ULL - -/* -* stores information about which areas of a given device are in use. -* one per device. The tree of tree roots points to the device tree -*/ -#define BTRFS_DEV_TREE_OBJECTID 4ULL - -/* one per subvolume, storing files and directories */ -#define BTRFS_FS_TREE_OBJECTID 5ULL - -/* directory objectid inside the root tree */ -#define BTRFS_ROOT_TREE_DIR_OBJECTID 6ULL -/* holds checksums of all the data extents */ -#define BTRFS_CSUM_TREE_OBJECTID 7ULL -#define BTRFS_QUOTA_TREE_OBJECTID 8ULL - -/* for storing items that use the BTRFS_UUID_KEY* */ -#define BTRFS_UUID_TREE_OBJECTID 9ULL - -/* tracks free space in block groups. */ -#define BTRFS_FREE_SPACE_TREE_OBJECTID 10ULL - -/* hold the block group items. */ -#define BTRFS_BLOCK_GROUP_TREE_OBJECTID 11ULL - -/* device stats in the device tree */ -#define BTRFS_DEV_STATS_OBJECTID 0ULL - -/* for storing balance parameters in the root tree */ -#define BTRFS_BALANCE_OBJECTID -4ULL - -/* orphan objectid for tracking unlinked/truncated files */ -#define BTRFS_ORPHAN_OBJECTID -5ULL - -/* does write ahead logging to speed up fsyncs */ -#define BTRFS_TREE_LOG_OBJECTID -6ULL -#define BTRFS_TREE_LOG_FIXUP_OBJECTID -7ULL - -/* space balancing */ -#define BTRFS_TREE_RELOC_OBJECTID -8ULL -#define BTRFS_DATA_RELOC_TREE_OBJECTID -9ULL - -/* -* extent checksums all have this objectid -* this allows them to share the logging tree -* for fsyncs -*/ -#define BTRFS_EXTENT_CSUM_OBJECTID -10ULL - -/* For storing free space cache */ -#define BTRFS_FREE_SPACE_OBJECTID -11ULL - -/* -* The inode number assigned to the special inode for storing -* free ino cache -*/ -#define BTRFS_FREE_INO_OBJECTID -12ULL - -/* dummy objectid represents multiple objectids */ -#define BTRFS_MULTIPLE_OBJECTIDS -255ULL - -/* -* All files have objectids in this range. -*/ -#define BTRFS_FIRST_FREE_OBJECTID 256ULL -#define BTRFS_LAST_FREE_OBJECTID -256ULL -#define BTRFS_FIRST_CHUNK_TREE_OBJECTID 256ULL - - - -/* -* the device items go into the chunk tree. The key is in the form -* [ 1 BTRFS_DEV_ITEM_KEY device_id ] -*/ -#define BTRFS_DEV_ITEMS_OBJECTID 1ULL - -#define BTRFS_EMPTY_SUBVOL_DIR_OBJECTID 2ULL - -/* -* the max metadata block size. This limit is somewhat artificial, -* but the memmove costs go through the roof for larger blocks. -*/ -#define BTRFS_MAX_METADATA_BLOCKSIZE 65536 - -/* -* we can actually store much bigger names, but lets not confuse the rest -* of linux -*/ -#define BTRFS_NAME_LEN 255 - -/* -* Theoretical limit is larger, but we keep this down to a sane -* value. That should limit greatly the possibility of collisions on -* inode ref items. -*/ -#define BTRFS_LINK_MAX 65535U - -/* 32 bytes in various csum fields */ -#define BTRFS_CSUM_SIZE 32 - -/* csum types */ -enum btrfs_csum_type { -BTRFS_CSUM_TYPE_CRC32 =0 , -BTRFS_CSUM_TYPE_XXHASH =1 , -BTRFS_CSUM_TYPE_SHA256 =2 , -BTRFS_CSUM_TYPE_BLAKE2 =3 , -}; - -#define BTRFS_EMPTY_DIR_SIZE 0 - -#define BTRFS_FT_UNKNOWN 0 -#define BTRFS_FT_REG_FILE 1 -#define BTRFS_FT_DIR 2 -#define BTRFS_FT_CHRDEV 3 -#define BTRFS_FT_BLKDEV 4 -#define BTRFS_FT_FIFO 5 -#define BTRFS_FT_SOCK 6 -#define BTRFS_FT_SYMLINK 7 -#define BTRFS_FT_XATTR 8 -#define BTRFS_FT_MAX 9 - -#define BTRFS_ROOT_SUBVOL_RDONLY (1ULL << 0) - -/* -* the key defines the order in the tree, and so it also defines (optimal) -* block layout. objectid corresponds to the inode number. The flags -* tells us things about the object, and is a kind of stream selector. -* so for a given inode, keys with flags of 1 might refer to the inode -* data, flags of 2 may point to file data in the btree and flags == 3 -* may point to extents. -* -* offset is the starting byte offset for this key in the stream. -* -* btrfs_disk_key is in disk byte order. struct btrfs_key is always -* in cpu native order. Otherwise they are identical and their sizes -* should be the same (ie both packed) -*/ -struct btrfs_disk_key { -__le64 objectid; -u8 type; -__le64 offset; -} __attribute__ ((__packed__ )); - -struct btrfs_key { -u64 objectid; -u8 type; -u64 offset; -} __attribute__ ((__packed__ )); -struct btrfs_mapping_tree {struct cache_tree cache_tree; }; -#define BTRFS_UUID_SIZE 16 -struct btrfs_dev_item { -/* the internal btrfs device id */ -__le64 devid; - -/* size of the device */ -__le64 total_bytes; - -/* bytes used */ -__le64 bytes_used; - -/* optimal io alignment for this device */ -__le32 io_align; - -/* optimal io width for this device */ -__le32 io_width; - -/* minimal io size for this device */ -__le32 sector_size; - -/* type and info about this device */ -__le64 type; - -/* expected generation for this device */ -__le64 generation; - -/* -* starting byte of this partition on the device, -* to allow for stripe alignment in the future -*/ -__le64 start_offset; - -/* grouping information for allocation decisions */ -__le32 dev_group; - -/* seek speed 0-100 where 100 is fastest */ -u8 seek_speed; - -/* bandwidth 0-100 where 100 is fastest */ -u8 bandwidth; - -/* btrfs generated uuid for this device */ -u8 uuid[BTRFS_UUID_SIZE ]; - -/* uuid of FS who owns this device */ -u8 fsid[BTRFS_UUID_SIZE ]; -} __attribute__ ((__packed__ )); - -struct btrfs_stripe { -__le64 devid; -__le64 offset; -u8 dev_uuid[BTRFS_UUID_SIZE ]; -} __attribute__ ((__packed__ )); - -struct btrfs_chunk { -/* size of this chunk in bytes */ -__le64 length; - -/* objectid of the root referencing this chunk */ -__le64 owner; - -__le64 stripe_len; -__le64 type; - -/* optimal io alignment for this chunk */ -__le32 io_align; - -/* optimal io width for this chunk */ -__le32 io_width; - -/* minimal io size for this chunk */ -__le32 sector_size; - -/* 2^16 stripes is quite a lot, a second limit is the size of a single -* item in the btree -*/ -__le16 num_stripes; - -/* sub stripes only matter for raid10 */ -__le16 sub_stripes; -struct btrfs_stripe stripe; -/* additional stripes go here */ -} __attribute__ ((__packed__ )); - -#define BTRFS_FREE_SPACE_EXTENT 1 -#define BTRFS_FREE_SPACE_BITMAP 2 - -struct btrfs_free_space_entry { -__le64 offset; -__le64 bytes; -u8 type; -} __attribute__ ((__packed__ )); - -struct btrfs_free_space_header { -struct btrfs_disk_key location; -__le64 generation; -__le64 num_entries; -__le64 num_bitmaps; -} __attribute__ ((__packed__ )); -static inline unsigned long btrfs_chunk_item_size (int num_stripes) {BUG_ON (num_stripes ==0 );
@@ -315,13 +53,6 @@ static inline unsigned long btrfs_chunk_item_size(int num_stripes)sizeof (struct btrfs_stripe ) * (num_stripes -1 ); } -#define BTRFS_HEADER_FLAG_WRITTEN (1ULL << 0) -#define BTRFS_HEADER_FLAG_RELOC (1ULL << 1) -#define BTRFS_SUPER_FLAG_SEEDING (1ULL << 32) -#define BTRFS_SUPER_FLAG_METADUMP (1ULL << 33) -#define BTRFS_SUPER_FLAG_METADUMP_V2 (1ULL << 34) -#define BTRFS_SUPER_FLAG_CHANGING_FSID (1ULL << 35) -#define BTRFS_SUPER_FLAG_CHANGING_FSID_V2 (1ULL << 36)#define BTRFS_SUPER_FLAG_CHANGING_CSUM (1ULL << 37)/*
@@ -331,32 +62,6 @@ static inline unsigned long btrfs_chunk_item_size(int num_stripes)*/ #define BTRFS_SUPER_FLAG_CHANGING_BG_TREE (1ULL << 38) -#define BTRFS_BACKREF_REV_MAX 256 -#define BTRFS_BACKREF_REV_SHIFT 56 -#define BTRFS_BACKREF_REV_MASK (((u64)BTRFS_BACKREF_REV_MAX - 1) << \ - BTRFS_BACKREF_REV_SHIFT) - -#define BTRFS_OLD_BACKREF_REV 0 -#define BTRFS_MIXED_BACKREF_REV 1 - -/* -* every tree block (leaf or node) starts with this header. -*/ -struct btrfs_header { -/* these first four must match the super block */ -u8 csum[BTRFS_CSUM_SIZE ]; -u8 fsid[BTRFS_FSID_SIZE ];/* FS specific uuid */ -__le64 bytenr;/* which block this node is supposed to live in */ -__le64 flags; - -/* allowed to be different from the super from here on down */ -u8 chunk_tree_uuid[BTRFS_UUID_SIZE ]; -__le64 generation; -__le64 owner; -__le32 nritems; -u8 level; -} __attribute__ ((__packed__ )); -static inline u32 __BTRFS_LEAF_DATA_SIZE (u32 nodesize) {return nodesize -sizeof (struct btrfs_header );
@@ -364,160 +69,9 @@ static inline u32 __BTRFS_LEAF_DATA_SIZE(u32 nodesize)#define BTRFS_LEAF_DATA_SIZE (fs_info) (fs_info->leaf_data_size) -/* -* this is a very generous portion of the super block, giving us -* room to translate 14 chunks with 3 stripes each. -*/ -#define BTRFS_SYSTEM_CHUNK_ARRAY_SIZE 2048 -#define BTRFS_LABEL_SIZE 256 - -/* -* just in case we somehow lose the roots and are not able to mount, -* we store an array of the roots from previous transactions -* in the super. -*/ -#define BTRFS_NUM_BACKUP_ROOTS 4 -struct btrfs_root_backup { -__le64 tree_root; -__le64 tree_root_gen; - -__le64 chunk_root; -__le64 chunk_root_gen; - -__le64 extent_root; -__le64 extent_root_gen; - -__le64 fs_root; -__le64 fs_root_gen; - -__le64 dev_root; -__le64 dev_root_gen; - -__le64 csum_root; -__le64 csum_root_gen; - -__le64 total_bytes; -__le64 bytes_used; -__le64 num_devices; -/* future */ -__le64 unsed_64[4 ]; - -u8 tree_root_level; -u8 chunk_root_level; -u8 extent_root_level; -u8 fs_root_level; -u8 dev_root_level; -u8 csum_root_level; -/* future and to align */ -u8 unused_8[10 ]; -} __attribute__ ((__packed__ )); -#define BTRFS_SUPER_INFO_OFFSET (65536)#define BTRFS_SUPER_INFO_SIZE (4096) -/* -* the super block basically lists the main trees of the FS -* it currently lacks any block count etc etc -*/ -struct btrfs_super_block { -u8 csum[BTRFS_CSUM_SIZE ]; -/* the first 3 fields must match struct btrfs_header */ -u8 fsid[BTRFS_FSID_SIZE ];/* FS specific uuid */ -__le64 bytenr;/* this block number */ -__le64 flags; - -/* allowed to be different from the btrfs_header from here own down */ -__le64 magic; -__le64 generation; -__le64 root; -__le64 chunk_root; -__le64 log_root; - -/* -* This has never been used and is 0 in all versions. We always use -* generation + 1 to read log tree root. -*/ -__le64 __unused_log_root_transid; -__le64 total_bytes; -__le64 bytes_used; -__le64 root_dir_objectid; -__le64 num_devices; -__le32 sectorsize; -__le32 nodesize; -/* Unused and must be equal to nodesize */ -__le32 __unused_leafsize; -__le32 stripesize; -__le32 sys_chunk_array_size; -__le64 chunk_root_generation; -__le64 compat_flags; -__le64 compat_ro_flags; -__le64 incompat_flags; -__le16 csum_type; -u8 root_level; -u8 chunk_root_level; -u8 log_root_level; -struct btrfs_dev_item dev_item; - -char label[BTRFS_LABEL_SIZE ]; - -__le64 cache_generation; -__le64 uuid_tree_generation; - -u8 metadata_uuid[BTRFS_FSID_SIZE ]; - -__le64 nr_global_roots; - -__le64 reserved[27 ]; -u8 sys_chunk_array[BTRFS_SYSTEM_CHUNK_ARRAY_SIZE ]; -struct btrfs_root_backup super_roots[BTRFS_NUM_BACKUP_ROOTS ]; -/* Padded to 4096 bytes */ -u8 padding[565 ]; -} __attribute__ ((__packed__ )); -BUILD_ASSERT (sizeof (struct btrfs_super_block ) ==BTRFS_SUPER_INFO_SIZE ); - -/* -* Compat flags that we support. If any incompat flags are set other than the -* ones specified below then we will fail to mount -*/ -#define BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE (1ULL << 0) -/* -* Older kernels on big-endian systems produced broken free space tree bitmaps, -* and btrfs-progs also used to corrupt the free space tree. If this bit is -* clear, then the free space tree cannot be trusted. btrfs-progs can also -* intentionally clear this bit to ask the kernel to rebuild the free space -* tree. -*/ -#define BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE_VALID (1ULL << 1) -#define BTRFS_FEATURE_COMPAT_RO_VERITY (1ULL << 2) - -/* -* Save all block group items into a dedicated block group tree, to greatly -* reduce mount time for large fs. -*/ -#define BTRFS_FEATURE_COMPAT_RO_BLOCK_GROUP_TREE (1ULL << 3) - -#define BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF (1ULL << 0) -#define BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL (1ULL << 1) -#define BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS (1ULL << 2) -#define BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO (1ULL << 3) -#define BTRFS_FEATURE_INCOMPAT_COMPRESS_ZSTD (1ULL << 4) - -/* -* older kernels tried to do bigger metadata blocks, but the -* code was pretty buggy. Lets not let them try anymore. -*/ -#define BTRFS_FEATURE_INCOMPAT_BIG_METADATA (1ULL << 5) -#define BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF (1ULL << 6) -#define BTRFS_FEATURE_INCOMPAT_RAID56 (1ULL << 7) -#define BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA (1ULL << 8) -#define BTRFS_FEATURE_INCOMPAT_NO_HOLES (1ULL << 9) -#define BTRFS_FEATURE_INCOMPAT_METADATA_UUID (1ULL << 10) -#define BTRFS_FEATURE_INCOMPAT_RAID1C34 (1ULL << 11) -#define BTRFS_FEATURE_INCOMPAT_ZONED (1ULL << 12) -#define BTRFS_FEATURE_INCOMPAT_EXTENT_TREE_V2 (1ULL << 13) - -#define BTRFS_FEATURE_COMPAT_SUPP 0ULL -/* * The FREE_SPACE_TREE and FREE_SPACE_TREE_VALID compat_ro bits must not be * added here until read-write support for the free space tree is implemented in
@@ -562,43 +116,6 @@ BUILD_ASSERT(sizeof(struct btrfs_super_block) == BTRFS_SUPER_INFO_SIZE); BTRFS_FEATURE_INCOMPAT_ZONED)#endif -/* -* A leaf is full of items. offset and size tell us where to find -* the item in the leaf (relative to the start of the data area) -*/ -struct btrfs_item { -struct btrfs_disk_key key; -__le32 offset; -__le32 size; -} __attribute__ ((__packed__ )); - -/* -* leaves have an item area and a data area: -* [item0, item1....itemN] [free space] [dataN...data1, data0] -* -* The data is separate from the items to get the keys closer together -* during searches. -*/ -struct btrfs_leaf { -struct btrfs_header header; -struct btrfs_item items[]; -} __attribute__ ((__packed__ )); - -/* -* all non-leaf blocks are nodes, they hold only keys and pointers to -* other blocks -*/ -struct btrfs_key_ptr { -struct btrfs_disk_key key; -__le64 blockptr; -__le64 generation; -} __attribute__ ((__packed__ )); - -struct btrfs_node { -struct btrfs_header header; -struct btrfs_key_ptr ptrs[]; -} __attribute__ ((__packed__ )); -/* * btrfs_paths remember the path taken from the root down to the leaf. * level 0 is always the leaf, and nodes[1...BTRFS_MAX_LEVEL] will point
@@ -627,92 +144,11 @@ struct btrfs_path {u8 skip_check_block; }; -/* -* items in the extent btree are used to record the objectid of the -* owner of the block and the number of references -*/ - -struct btrfs_extent_item { -__le64 refs; -__le64 generation; -__le64 flags; -} __attribute__ ((__packed__ )); - -struct btrfs_extent_item_v0 { -__le32 refs; -} __attribute__ ((__packed__ )); -#define BTRFS_MAX_EXTENT_ITEM_SIZE (r) \ ((BTRFS_LEAF_DATA_SIZE(r->fs_info) >> 4) - \ sizeof(struct btrfs_item))#define BTRFS_MAX_EXTENT_SIZE 128UL * 1024 * 1024 -#define BTRFS_EXTENT_FLAG_DATA (1ULL << 0) -#define BTRFS_EXTENT_FLAG_TREE_BLOCK (1ULL << 1) - -/* following flags only apply to tree blocks */ - -/* use full backrefs for extent pointers in the block*/ -#define BTRFS_BLOCK_FLAG_FULL_BACKREF (1ULL << 8) - -struct btrfs_tree_block_info { -struct btrfs_disk_key key; -u8 level; -} __attribute__ ((__packed__ )); - -struct btrfs_extent_data_ref { -__le64 root; -__le64 objectid; -__le64 offset; -__le32 count; -} __attribute__ ((__packed__ )); - -struct btrfs_shared_data_ref { -__le32 count; -} __attribute__ ((__packed__ )); - -struct btrfs_extent_inline_ref { -u8 type; -__le64 offset; -} __attribute__ ((__packed__ )); - -struct btrfs_extent_ref_v0 { -__le64 root; -__le64 generation; -__le64 objectid; -__le32 count; -} __attribute__ ((__packed__ )); - -/* dev extents record free space on individual devices. The owner -* field points back to the chunk allocation mapping tree that allocated -* the extent. The chunk tree uuid field is a way to double check the owner -*/ -struct btrfs_dev_extent { -__le64 chunk_tree; -__le64 chunk_objectid; -__le64 chunk_offset; -__le64 length; -u8 chunk_tree_uuid[BTRFS_UUID_SIZE ]; -} __attribute__ ((__packed__ )); - -struct btrfs_inode_ref { -__le64 index; -__le16 name_len; -/* name goes here */ -} __attribute__ ((__packed__ )); - -struct btrfs_inode_extref { -__le64 parent_objectid; -__le64 index; -__le16 name_len; -__u8 name[0 ];/* name goes here */ -} __attribute__ ((__packed__ )); - -struct btrfs_timespec { -__le64 sec; -__le32 nsec; -} __attribute__ ((__packed__ )); - typedef enum { BTRFS_COMPRESS_NONE = 0, BTRFS_COMPRESS_ZLIB = 1,
@@ -722,12 +158,6 @@ typedef enum {BTRFS_COMPRESS_LAST =4 , } btrfs_compression_type; -/* we don't understand any encryption methods right now */ -typedef enum { -BTRFS_ENCRYPTION_NONE =0 , -BTRFS_ENCRYPTION_LAST =1 , -}btrfs_encryption_type ; -enum btrfs_tree_block_status {BTRFS_TREE_BLOCK_CLEAN , BTRFS_TREE_BLOCK_INVALID_NRITEMS,
@@ -739,269 +169,6 @@ enum btrfs_tree_block_status { BTRFS_TREE_BLOCK_INVALID_BLOCKPTR, }; -struct btrfs_inode_item { -/* nfs style generation number */ -__le64 generation; -/* transid that last touched this inode */ -__le64 transid; -__le64 size; -__le64 nbytes; -__le64 block_group; -__le32 nlink; -__le32 uid; -__le32 gid; -__le32 mode; -__le64 rdev; -__le64 flags; - -/* modification sequence number for NFS */ -__le64 sequence; - -/* -* a little future expansion, for more than this we can -* just grow the inode item and version it -*/ -__le64 reserved[4 ]; -struct btrfs_timespec atime; -struct btrfs_timespec ctime; -struct btrfs_timespec mtime; -struct btrfs_timespec otime; -} __attribute__ ((__packed__ )); - -struct btrfs_dir_log_item { -__le64 end; -} __attribute__ ((__packed__ )); - -struct btrfs_dir_item { -struct btrfs_disk_key location; -__le64 transid; -__le16 data_len; -__le16 name_len; -u8 type; -} __attribute__ ((__packed__ )); - -struct btrfs_root_item_v0 { -struct btrfs_inode_item inode; -__le64 generation; -__le64 root_dirid; -__le64 bytenr; -__le64 byte_limit; -__le64 bytes_used; -__le64 last_snapshot; -__le64 flags; -__le32 refs; -struct btrfs_disk_key drop_progress; -u8 drop_level; -u8 level; -} __attribute__ ((__packed__ )); - -struct btrfs_root_item { -struct btrfs_inode_item inode; -__le64 generation; -__le64 root_dirid; -__le64 bytenr; -__le64 byte_limit; -__le64 bytes_used; -__le64 last_snapshot; -__le64 flags; -__le32 refs; -struct btrfs_disk_key drop_progress; -u8 drop_level; -u8 level; - -/* -* The following fields appear after subvol_uuids+subvol_times -* were introduced. -*/ - -/* -* This generation number is used to test if the new fields are valid -* and up to date while reading the root item. Every time the root item -* is written out, the "generation" field is copied into this field. If -* anyone ever mounted the fs with an older kernel, we will have -* mismatching generation values here and thus must invalidate the -* new fields. See btrfs_update_root and btrfs_find_last_root for -* details. -* the offset of generation_v2 is also used as the start for the memset -* when invalidating the fields. -*/ -__le64 generation_v2; -u8 uuid[BTRFS_UUID_SIZE ]; -u8 parent_uuid[BTRFS_UUID_SIZE ]; -u8 received_uuid[BTRFS_UUID_SIZE ]; -__le64 ctransid;/* updated when an inode changes */ -__le64 otransid;/* trans when created */ -__le64 stransid;/* trans when sent. non-zero for received subvol */ -__le64 rtransid;/* trans when received. non-zero for received subvol */ -struct btrfs_timespec ctime; -struct btrfs_timespec otime; -struct btrfs_timespec stime; -struct btrfs_timespec rtime; - -/* -* If we want to use a specific set of fst/checksum/extent roots for -* this root. -*/ -__le64 global_tree_id; -__le64 reserved[7 ];/* for future */ -} __attribute__ ((__packed__ )); - -/* -* this is used for both forward and backward root refs -*/ -struct btrfs_root_ref { -__le64 dirid; -__le64 sequence; -__le16 name_len; -} __attribute__ ((__packed__ )); - -struct btrfs_disk_balance_args { -/* -* profiles to operate on, single is denoted by -* BTRFS_AVAIL_ALLOC_BIT_SINGLE -*/ -__le64 profiles; - -/* -* usage filter -* BTRFS_BALANCE_ARGS_USAGE with a single value means '0..N' -* BTRFS_BALANCE_ARGS_USAGE_RANGE - range syntax, min..max -*/ -union { -__le64 usage; -struct { -__le32 usage_min; -__le32 usage_max; - }; - }; - -/* devid filter */ -__le64 devid; - -/* devid subset filter [pstart..pend) */ -__le64 pstart; -__le64 pend; - -/* btrfs virtual address space subset filter [vstart..vend) */ -__le64 vstart; -__le64 vend; - -/* -* profile to convert to, single is denoted by -* BTRFS_AVAIL_ALLOC_BIT_SINGLE -*/ -__le64 target; - -/* BTRFS_BALANCE_ARGS_* */ -__le64 flags; - -/* -* BTRFS_BALANCE_ARGS_LIMIT with value 'limit' -* BTRFS_BALANCE_ARGS_LIMIT_RANGE - the extend version can use minimum -* and maximum -*/ -union { -__le64 limit; -struct { -__le32 limit_min; -__le32 limit_max; - }; - }; - -/* -* Process chunks that cross stripes_min..stripes_max devices, -* BTRFS_BALANCE_ARGS_STRIPES_RANGE -*/ -__le32 stripes_min; -__le32 stripes_max; - -__le64 unused[6 ]; -} __attribute__ ((__packed__ )); - -/* -* store balance parameters to disk so that balance can be properly -* resumed after crash or unmount -*/ -struct btrfs_balance_item { -/* BTRFS_BALANCE_* */ -__le64 flags; - -struct btrfs_disk_balance_args data; -struct btrfs_disk_balance_args meta; -struct btrfs_disk_balance_args sys; - -__le64 unused[4 ]; -} __attribute__ ((__packed__ )); - -#define BTRFS_FILE_EXTENT_INLINE 0 -#define BTRFS_FILE_EXTENT_REG 1 -#define BTRFS_FILE_EXTENT_PREALLOC 2 - -struct btrfs_file_extent_item { -/* -* transaction id that created this extent -*/ -__le64 generation; -/* -* max number of bytes to hold this extent in ram -* when we split a compressed extent we can't know how big -* each of the resulting pieces will be. So, this is -* an upper limit on the size of the extent in ram instead of -* an exact limit. -*/ -__le64 ram_bytes; - -/* -* 32 bits for the various ways we might encode the data, -* including compression and encryption. If any of these -* are set to something a given disk format doesn't understand -* it is treated like an incompat flag for reading and writing, -* but not for stat. -*/ -u8 compression; -u8 encryption; -__le16 other_encoding;/* spare for later use */ - -/* are we inline data or a real extent? */ -u8 type; - -/* -* Disk space consumed by the data extent -* Data checksum is stored in csum tree, thus no bytenr/length takes -* csum into consideration. -* -* The inline extent data starts at this offset in the structure. -*/ -__le64 disk_bytenr; -__le64 disk_num_bytes; -/* -* The logical offset in file blocks. -* this extent record is for. This allows a file extent to point -* into the middle of an existing extent on disk, sharing it -* between two snapshots (useful if some bytes in the middle of the -* extent have changed -*/ -__le64 offset; -/* -* The logical number of file blocks. This always reflects the size -* uncompressed and without encoding. -*/ -__le64 num_bytes; - -} __attribute__ ((__packed__ )); - -struct btrfs_dev_stats_item { -/* -* grow this item struct at the end for future enhancements and keep -* the existing values unchanged -*/ -__le64 values[BTRFS_DEV_STAT_VALUES_MAX ]; -} __attribute__ ((__packed__ )); - -struct btrfs_csum_item { -u8 csum; -} __attribute__ ((__packed__ )); -/* * We don't want to overwrite 1M at the beginning of device, even though * there is our 1st superblock at 64k. Some possible reasons:
@@ -1010,20 +177,6 @@ struct btrfs_csum_item {*/ #define BTRFS_BLOCK_RESERVED_1M_FOR_SUPER ((u64)1 * 1024 * 1024) -#define BTRFS_BLOCK_GROUP_DATA (1ULL << 0) -#define BTRFS_BLOCK_GROUP_SYSTEM (1ULL << 1) -#define BTRFS_BLOCK_GROUP_METADATA (1ULL << 2) -#define BTRFS_BLOCK_GROUP_RAID0 (1ULL << 3) -#define BTRFS_BLOCK_GROUP_RAID1 (1ULL << 4) -#define BTRFS_BLOCK_GROUP_DUP (1ULL << 5) -#define BTRFS_BLOCK_GROUP_RAID10 (1ULL << 6) -#define BTRFS_BLOCK_GROUP_RAID5 (1ULL << 7) -#define BTRFS_BLOCK_GROUP_RAID6 (1ULL << 8) -#define BTRFS_BLOCK_GROUP_RAID1C3 (1ULL << 9) -#define BTRFS_BLOCK_GROUP_RAID1C4 (1ULL << 10) -#define BTRFS_BLOCK_GROUP_RESERVED (BTRFS_AVAIL_ALLOC_BIT_SINGLE | \ - BTRFS_SPACE_INFO_GLOBAL_RSV) -enum btrfs_raid_types {BTRFS_RAID_RAID10 ,BTRFS_RAID_RAID1 ,
@@ -1037,32 +190,6 @@ enum btrfs_raid_types { BTRFS_NR_RAID_TYPES }; -#define BTRFS_BLOCK_GROUP_TYPE_MASK (BTRFS_BLOCK_GROUP_DATA | \ - BTRFS_BLOCK_GROUP_SYSTEM | \ - BTRFS_BLOCK_GROUP_METADATA) - -#define BTRFS_BLOCK_GROUP_PROFILE_MASK (BTRFS_BLOCK_GROUP_RAID0 | \ - BTRFS_BLOCK_GROUP_RAID1 | \ - BTRFS_BLOCK_GROUP_RAID5 | \ - BTRFS_BLOCK_GROUP_RAID6 | \ - BTRFS_BLOCK_GROUP_RAID1C3 | \ - BTRFS_BLOCK_GROUP_RAID1C4 | \ - BTRFS_BLOCK_GROUP_DUP | \ - BTRFS_BLOCK_GROUP_RAID10) - -#define BTRFS_BLOCK_GROUP_RAID56_MASK (BTRFS_BLOCK_GROUP_RAID5 | \ - BTRFS_BLOCK_GROUP_RAID6) - -#define BTRFS_BLOCK_GROUP_RAID1_MASK (BTRFS_BLOCK_GROUP_RAID1 | \ - BTRFS_BLOCK_GROUP_RAID1C3 | \ - BTRFS_BLOCK_GROUP_RAID1C4) - -/* used in struct btrfs_balance_args fields */ -#define BTRFS_AVAIL_ALLOC_BIT_SINGLE (1ULL << 48) - -#define BTRFS_EXTENDED_PROFILE_MASK (BTRFS_BLOCK_GROUP_PROFILE_MASK | \ - BTRFS_AVAIL_ALLOC_BIT_SINGLE) -/* * GLOBAL_RSV does not exist as a on-disk block group type and is used * internally for exporting info about global block reserve from space infos
@@ -1071,65 +198,11 @@ enum btrfs_raid_types {#define BTRFS_QGROUP_LEVEL_SHIFT 48 -static inline __u16 btrfs_qgroup_level (u64 qgroupid) -{ -return qgroupid >>BTRFS_QGROUP_LEVEL_SHIFT ; -} -static inline u64 btrfs_qgroup_subvid (u64 qgroupid) {return qgroupid & ((1ULL <<BTRFS_QGROUP_LEVEL_SHIFT ) -1 ); } -#define BTRFS_QGROUP_STATUS_FLAG_ON (1ULL << 0) -#define BTRFS_QGROUP_STATUS_FLAG_RESCAN (1ULL << 1) -#define BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT (1ULL << 2) - -struct btrfs_qgroup_status_item { -__le64 version; -__le64 generation; -__le64 flags; -__le64 rescan;/* progress during scanning */ -} __attribute__ ((__packed__ )); - -#define BTRFS_QGROUP_STATUS_VERSION 1 -struct btrfs_block_group_item { -__le64 used; -__le64 chunk_objectid; -__le64 flags; -} __attribute__ ((__packed__ )); - -struct btrfs_free_space_info { -__le32 extent_count; -__le32 flags; -} __attribute__ ((__packed__ )); - -#define BTRFS_FREE_SPACE_USING_BITMAPS (1ULL << 0) - -struct btrfs_qgroup_info_item { -__le64 generation; -__le64 rfer; -__le64 rfer_cmpr; -__le64 excl; -__le64 excl_cmpr; -} __attribute__ ((__packed__ )); - -/* flags definition for qgroup limits */ -#define BTRFS_QGROUP_LIMIT_MAX_RFER (1ULL << 0) -#define BTRFS_QGROUP_LIMIT_MAX_EXCL (1ULL << 1) -#define BTRFS_QGROUP_LIMIT_RSV_RFER (1ULL << 2) -#define BTRFS_QGROUP_LIMIT_RSV_EXCL (1ULL << 3) -#define BTRFS_QGROUP_LIMIT_RFER_CMPR (1ULL << 4) -#define BTRFS_QGROUP_LIMIT_EXCL_CMPR (1ULL << 5) - -struct btrfs_qgroup_limit_item { -__le64 flags; -__le64 max_rfer; -__le64 max_excl; -__le64 rsv_rfer; -__le64 rsv_excl; -} __attribute__ ((__packed__ )); -struct btrfs_space_info {u64 flags;u64 total_bytes;
@@ -1552,21 +625,6 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info)* data in the FS */ #define BTRFS_STRING_ITEM_KEY 253 -/* -* Inode flags -*/ -#define BTRFS_INODE_NODATASUM (1 << 0) -#define BTRFS_INODE_NODATACOW (1 << 1) -#define BTRFS_INODE_READONLY (1 << 2) -#define BTRFS_INODE_NOCOMPRESS (1 << 3) -#define BTRFS_INODE_PREALLOC (1 << 4) -#define BTRFS_INODE_SYNC (1 << 5) -#define BTRFS_INODE_IMMUTABLE (1 << 6) -#define BTRFS_INODE_APPEND (1 << 7) -#define BTRFS_INODE_NODUMP (1 << 8) -#define BTRFS_INODE_NOATIME (1 << 9) -#define BTRFS_INODE_DIRSYNC (1 << 10) -#define BTRFS_INODE_COMPRESS (1 << 11)#define read_eb_member (eb, ptr, type, member, result) ( \ read_extent_buffer(eb, (char *)(result), \
@@ -1936,12 +994,6 @@ static inline u32 btrfs_extent_inline_ref_size(int type)return 0 ; } -BTRFS_SETGET_FUNCS(ref_root_v0, struct btrfs_extent_ref_v0, root, 64); -BTRFS_SETGET_FUNCS(ref_generation_v0, struct btrfs_extent_ref_v0, - generation,64 ); -BTRFS_SETGET_FUNCS(ref_objectid_v0, struct btrfs_extent_ref_v0, objectid, 64); -BTRFS_SETGET_FUNCS(ref_count_v0, struct btrfs_extent_ref_v0, count, 32); -/* struct btrfs_node */ BTRFS_SETGET_FUNCS(key_blockptr, struct btrfs_key_ptr, blockptr, 64); BTRFS_SETGET_FUNCS(key_generation, struct btrfs_key_ptr, generation, 64);
kernel-shared/uapi/btrfs_tree.h new file +1259 -0
1,259 lines not on this page · raw message
Signature · 1 line
2.26.3
PATCH v2 15/18 btrfs-progs: replace btrfs_leaf_data with btrfs_item_nr_offset
In reply to Josef BacikWe're using btrfs_item_nr_offset(leaf, 0) to get the start of the leaf data in the kernel, we don't have btrfs_leaf_data. Replace all occurrences of btrfs_leaf_data() with btrfs_item_nr_offset(leaf, 0) in order to make syncing accessors.[ch] easier. ctree.c will be synced later, so this is simply an intermediate step.
--- btrfs-corrupt-block.c | 4 ++-- check/main.c | 4 ++-- image/main.c | 8 +++---- kernel-shared/ctree.c | 50 +++++++++++++++++++++---------------------- 4 files changed, 33 insertions(+), 33 deletions(-)
btrfs-corrupt-block.c +2 -2
@@ -845,8 +845,8 @@ static void shift_items(struct btrfs_root *root, struct extent_buffer *eb)unsigned int data_end =btrfs_item_offset (eb, nritems -1 );/* Shift the item data up to and including slot back by shift space */ -memmove_extent_buffer (eb,btrfs_leaf_data (eb) + data_end - shift_space, -btrfs_leaf_data (eb) + data_end, +memmove_extent_buffer (eb,btrfs_item_nr_offset (eb,0 ) + data_end - shift_space, +btrfs_item_nr_offset (eb,0 ) + data_end,btrfs_item_offset (eb, slot -1 ) - data_end);/* Now update the item pointers. */
check/main.c +2 -2
@@ -4429,8 +4429,8 @@ again: i, shift, (unsigned long long)buf->start); offset =btrfs_item_offset (buf, i);memmove_extent_buffer (buf, -btrfs_leaf_data (buf) + offset + shift, -btrfs_leaf_data (buf) + offset, +btrfs_item_nr_offset (buf,0 ) + offset + shift, +btrfs_item_nr_offset (buf,0 ) + offset,btrfs_item_size (buf, i));btrfs_set_item_offset (buf, i, offset + shift);btrfs_mark_buffer_dirty (buf);
image/main.c +4 -4
@@ -323,7 +323,7 @@ static void zero_items(struct metadump_struct *md, u8 *dst,btrfs_item_key_to_cpu (src, &key, i);if (key.type ==BTRFS_CSUM_ITEM_KEY ) { size =btrfs_item_size (src, i); -memset (dst +btrfs_leaf_data (src) + +memset (dst +btrfs_item_nr_offset (src,0 ) +btrfs_item_offset (src, i),0 , size);continue ; }
@@ -369,7 +369,7 @@ static void copy_buffer(struct metadump_struct *md, u8 *dst, size =sizeof (struct btrfs_header );memset (dst + size,0 , src->len - size); }else if (level ==0 ) { - size =btrfs_leaf_data (src) + + size =btrfs_item_nr_offset (src,0 ) +btrfs_item_offset (src, nritems -1 ) -btrfs_item_nr_offset (src, nritems);memset (dst +btrfs_item_nr_offset (src, nritems),0 , size);
@@ -1248,8 +1248,8 @@ static void truncate_item(struct extent_buffer *eb, int slot, u32 new_size)btrfs_set_item_offset (eb, i, ioff + size_diff); } -memmove_extent_buffer (eb,btrfs_leaf_data (eb) + data_end + size_diff, -btrfs_leaf_data (eb) + data_end, +memmove_extent_buffer (eb,btrfs_item_nr_offset (eb,0 ) + data_end + size_diff, +btrfs_item_nr_offset (eb,0 ) + data_end, old_data_start + new_size - data_end);btrfs_set_item_size (eb, slot, new_size); }
kernel-shared/ctree.c +25 -25
129 lines not on this page · raw message
Signature · 1 line
2.26.3
PATCH v2 11/18 btrfs: stop using btrfs_root_item_v0
In reply to Josef BacikThis isn't defined in the kernel, we simply check if the root item size is less than btrfs_root_item, so adjust the user of btrfs_root_item_v0 to make a similar check.
--- cmds/subvolume-list.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
cmds/subvolume-list.c +2 -2
@@ -870,8 +870,8 @@ static int list_subvol_search(int fd, struct rb_root *root_lookup) ri = (struct btrfs_root_item *)(args.buf + off); gen =btrfs_root_generation (ri); flags =btrfs_root_flags (ri); -if (sh.len > -sizeof (struct btrfs_root_item_v0 )) { +if (sh.len < +sizeof (struct btrfs_root_item )) { otime =btrfs_stack_timespec_sec (&ri->otime); ogen =btrfs_root_otransid (ri);memcpy (uuid, ri->uuid,BTRFS_UUID_SIZE );
Signature · 1 line
2.26.3
PATCH v2 14/18 btrfs-progs: sync messages.* from the kernel
In reply to Josef BacikThese are the printk helpers from the kernel. There were a few modifications, the hi-lights are
- We do not have fs_info::fs_state, so that needed to be removed.
- We do not have discard.h sync'ed yet, so that dependency was dropped.
- Anything related to struct super_block was commented out.
- The transaction abort had to be modified to fit with the current btrfs-progs code.
Additionally there were kerncompat.h changes that needed to be made to handle the dependencies properly. Those are easier to spot.
Any function that needed to be modified has a MODIFIED tag in the comment section with a list of things that were changed.
--- Makefile | 1 + btrfs-corrupt-block.c | 1 + btrfstune.c | 1 + check/clear-cache.c | 1 + check/main.c | 1 + check/mode-common.c | 1 + check/mode-lowmem.c | 1 + cmds/filesystem-du.c | 1 + cmds/filesystem-usage.c | 1 + cmds/qgroup.c | 1 + cmds/replace.c | 1 + cmds/rescue-chunk-recover.c | 1 + cmds/rescue.c | 1 + cmds/subvolume-list.c | 1 + common/units.c | 1 + convert/common.c | 1 + convert/source-ext2.c | 1 + image/main.c | 1 + kerncompat.h | 44 ++-- kernel-shared/backref.c | 1 + kernel-shared/ctree.h | 2 + kernel-shared/delayed-ref.c | 1 + kernel-shared/extent_io.c | 1 + kernel-shared/free-space-tree.c | 1 + kernel-shared/messages.c | 372 ++++++++++++++++++++++++++++++++ kernel-shared/messages.h | 253 ++++++++++++++++++++++ kernel-shared/transaction.c | 5 - kernel-shared/transaction.h | 1 - kernel-shared/ulist.c | 1 + kernel-shared/zoned.h | 1 + libbtrfs/ctree.h | 1 + mkfs/main.c | 1 + 32 files changed, 677 insertions(+), 26 deletions(-) create mode 100644 kernel-shared/messages.c create mode 100644 kernel-shared/messages.h
Makefile +1 -0
@@ -166,6 +166,7 @@ objects = \ kernel-shared/free-space-tree.o \ kernel-shared/inode-item.o \ kernel-shared/inode.o \ + kernel-shared/messages.o \ kernel-shared/print-tree.o \ kernel-shared/root-tree.o \ kernel-shared/transaction.o \
btrfs-corrupt-block.c +1 -0
@@ -28,6 +28,7 @@#include "kernel-shared/disk-io.h" #include "kernel-shared/transaction.h" #include "kernel-shared/extent_io.h" +#include "kernel-shared/messages.h" #include "common/utils.h" #include "common/help.h" #include "common/extent-cache.h"
btrfstune.c +1 -0
@@ -31,6 +31,7 @@#include "kernel-shared/transaction.h" #include "kernel-shared/volumes.h" #include "kernel-shared/extent_io.h" +#include "kernel-shared/messages.h" #include "common/defs.h" #include "common/utils.h" #include "common/extent-cache.h"
check/clear-cache.c +1 -0
@@ -21,6 +21,7 @@#include "kernel-shared/free-space-tree.h" #include "kernel-shared/volumes.h" #include "kernel-shared/transaction.h" +#include "kernel-shared/messages.h" #include "common/internal.h" #include "common/messages.h" #include "check/common.h"
check/main.c +1 -0
@@ -41,6 +41,7 @@#include "kernel-shared/free-space-tree.h" #include "kernel-shared/backref.h" #include "kernel-shared/ulist.h" +#include "kernel-shared/messages.h" #include "common/defs.h" #include "common/extent-cache.h" #include "common/internal.h"
check/mode-common.c +1 -0
@@ -28,6 +28,7 @@#include "kernel-shared/volumes.h" #include "kernel-shared/backref.h" #include "kernel-shared/compression.h" +#include "kernel-shared/messages.h" #include "common/internal.h" #include "common/messages.h" #include "common/utils.h"
check/mode-lowmem.c +1 -0
@@ -30,6 +30,7 @@#include "kernel-shared/backref.h" #include "kernel-shared/compression.h" #include "kernel-shared/volumes.h" +#include "kernel-shared/messages.h" #include "common/messages.h" #include "common/internal.h" #include "common/utils.h"
cmds/filesystem-du.c +1 -0
@@ -32,6 +32,7 @@#include "kernel-lib/rbtree_types.h" #include "kernel-lib/interval_tree_generic.h" #include "kernel-shared/ctree.h" +#include "kernel-shared/messages.h" #include "common/utils.h" #include "common/open-utils.h" #include "common/units.h"
cmds/filesystem-usage.c +1 -0
@@ -31,6 +31,7 @@#include "kernel-shared/ctree.h" #include "kernel-shared/disk-io.h" #include "kernel-shared/volumes.h" +#include "kernel-shared/messages.h" #include "common/utils.h" #include "common/string-table.h" #include "common/open-utils.h"
cmds/qgroup.c +1 -0
@@ -39,6 +39,7 @@#include "cmds/commands.h" #include "cmds/qgroup.h" #include "kernel-shared/uapi/btrfs.h" +#include "kernel-shared/messages.h" #define BTRFS_QGROUP_NFILTERS_INCREASE (2 * BTRFS_QGROUP_FILTER_MAX)#define BTRFS_QGROUP_NCOMPS_INCREASE (2 * BTRFS_QGROUP_COMP_MAX)
cmds/replace.c +1 -0
@@ -40,6 +40,7 @@#include "cmds/commands.h" #include "mkfs/common.h" #include "kernel-shared/uapi/btrfs.h" +#include "kernel-shared/messages.h" static int print_replace_status (int fd,const char *path,int once);static char *time2string (char *buf,size_t s,__u64 t);
cmds/rescue-chunk-recover.c +1 -0
@@ -38,6 +38,7 @@#include "cmds/rescue.h" #include "check/common.h" #include "kernel-shared/uapi/btrfs.h" +#include "kernel-shared/messages.h" struct recover_control {int verbose;
cmds/rescue.c +1 -0
@@ -28,6 +28,7 @@#include "kernel-shared/transaction.h" #include "kernel-shared/disk-io.h" #include "kernel-shared/extent_io.h" +#include "kernel-shared/messages.h" #include "common/messages.h" #include "common/utils.h" #include "common/help.h"
cmds/subvolume-list.c +1 -0
@@ -36,6 +36,7 @@#include "common/utils.h" #include "cmds/commands.h" #include "kernel-shared/uapi/btrfs.h" +#include "kernel-shared/messages.h" /* * Naming of options:
common/units.c +1 -0
@@ -18,6 +18,7 @@#include <string.h> #include "common/units.h" #include "common/messages.h" +#include "kernel-shared/messages.h" /* * Note: this function uses a static per-thread buffer. Do not call this
convert/common.c +1 -0
@@ -30,6 +30,7 @@#include "mkfs/common.h" #include "convert/common.h" #include "kernel-shared/uapi/btrfs.h" +#include "kernel-shared/messages.h" #define BTRFS_CONVERT_META_GROUP_SIZE SZ_32M
convert/source-ext2.c +1 -0
@@ -27,6 +27,7 @@#include <string.h> #include "kernel-lib/sizes.h" #include "kernel-shared/transaction.h" +#include "kernel-shared/messages.h" #include "common/extent-cache.h" #include "common/messages.h" #include "convert/common.h"
image/main.c +1 -0
@@ -39,6 +39,7 @@#include "kernel-shared/transaction.h" #include "kernel-shared/volumes.h" #include "kernel-shared/extent_io.h" +#include "kernel-shared/messages.h" #include "crypto/crc32c.h" #include "common/internal.h" #include "common/messages.h"
kerncompat.h +24 -20
69 lines not on this page · raw message
kernel-shared/backref.c +1 -0
@@ -23,6 +23,7 @@#include "kernel-shared/ulist.h" #include "kernel-shared/transaction.h" #include "common/internal.h" +#include "messages.h" #define pr_debug (...) do { } while (0)
kernel-shared/ctree.h +2 -0
@@ -367,6 +367,8 @@ struct btrfs_fs_info {u64 zone_size;u64 zoned; }; + +struct super_block *sb; };static inline bool btrfs_is_zoned (const struct btrfs_fs_info *fs_info)
kernel-shared/delayed-ref.c +1 -0
@@ -20,6 +20,7 @@#include "kernel-shared/ctree.h" #include "kernel-shared/delayed-ref.h" #include "kernel-shared/transaction.h" +#include "messages.h" /* * delayed back reference update tracking. For subvolume trees
kernel-shared/extent_io.c +1 -0
@@ -33,6 +33,7 @@#include "common/utils.h" #include "common/device-utils.h" #include "common/internal.h" +#include "messages.h" void extent_io_tree_init (struct extent_io_tree *tree) {
kernel-shared/free-space-tree.c +1 -0
@@ -24,6 +24,7 @@#include "kernel-shared/transaction.h" #include "kernel-lib/bitops.h" #include "common/internal.h" +#include "messages.h" static struct btrfs_root *btrfs_free_space_root (struct btrfs_fs_info *fs_info,struct btrfs_block_group *block_group)
kernel-shared/messages.c new file +372 -0
372 lines not on this page · raw message
kernel-shared/messages.h new file +253 -0
253 lines not on this page · raw message
kernel-shared/transaction.c +0 -5
@@ -277,8 +277,3 @@ error:free (trans);return ret; } - -void btrfs_abort_transaction (struct btrfs_trans_handle *trans,int error) -{ - trans->fs_info->transaction_aborted = error; -}
kernel-shared/transaction.h +0 -1
@@ -47,6 +47,5 @@ int commit_tree_roots(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info);int btrfs_commit_transaction (struct btrfs_trans_handle *trans,struct btrfs_root *root); -void btrfs_abort_transaction (struct btrfs_trans_handle *trans,int error);#endif
kernel-shared/ulist.c +1 -0
@@ -21,6 +21,7 @@#include "kerncompat.h" #include "ulist.h" #include "kernel-shared/ctree.h" +#include "messages.h" /* * ulist is a generic data structure to hold a collection of unique u64
kernel-shared/zoned.h +1 -0
@@ -22,6 +22,7 @@#include <stdbool.h> #include "kernel-shared/disk-io.h" #include "kernel-shared/volumes.h" +#include "messages.h" #ifdef BTRFS_ZONED #include <linux/blkzoned.h>
libbtrfs/ctree.h +1 -0
@@ -26,6 +26,7 @@#include "kernel-lib/rbtree.h" #include "kerncompat.h" #include "kernel-shared/uapi/btrfs.h" +#include "kernel-shared/messages.h" #else #include <btrfs/list.h> #include <btrfs/rbtree.h>
mkfs/main.c +1 -0
@@ -37,6 +37,7 @@#include "kernel-shared/volumes.h" #include "kernel-shared/transaction.h" #include "kernel-shared/zoned.h" +#include "kernel-shared/messages.h" #include "crypto/crc32c.h" #include "common/defs.h" #include "common/internal.h"
Signature · 1 line
2.26.3
PATCH v2 16/18 btrfs-progs: don't use btrfs_header_csum helper
In reply to Josef BacikThis is a useless helper, the csum is always the first thing in the header, simply read from offset 0.
--- cmds/rescue-chunk-recover.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
cmds/rescue-chunk-recover.c +1 -2
@@ -94,8 +94,7 @@ static struct extent_record *btrfs_new_extent_record(struct extent_buffer *eb) rec->cache.start =btrfs_header_bytenr (eb); rec->cache.size = eb->len; rec->generation =btrfs_header_generation (eb); -read_extent_buffer (eb, rec->csum, (unsigned long )btrfs_header_csum (eb), -BTRFS_CSUM_SIZE ); +read_extent_buffer (eb, rec->csum,0 ,BTRFS_CSUM_SIZE );return rec; }
Signature · 1 line
2.26.3
PATCH v2 17/18 btrfs-progs: make write_extent_buffer take a const eb
In reply to Josef BacikThis is what we do in the kernel, and while we're syncing individual files we're going to have state where some callers are using a const, but progs isn't. So adjust write_extent_buffer to take a const eb in order to make this less painful.
--- kernel-shared/extent_io.c | 4 ++-- kernel-shared/extent_io.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
kernel-shared/extent_io.c +2 -2
@@ -1073,10 +1073,10 @@ void read_extent_buffer(const struct extent_buffer *eb, void *dst,memcpy (dst, eb->data + start, len); } -void write_extent_buffer (struct extent_buffer *eb,const void *src, +void write_extent_buffer (const struct extent_buffer *eb,const void *src,unsigned long start,unsigned long len) { -memcpy (eb->data + start, src, len); +memcpy ((void *)eb->data + start, src, len); } void copy_extent_buffer(struct extent_buffer *dst, struct extent_buffer *src,
kernel-shared/extent_io.h +1 -1
@@ -144,7 +144,7 @@ int memcmp_extent_buffer(const struct extent_buffer *eb, const void *ptrv, unsigned long start, unsigned long len);void read_extent_buffer (const struct extent_buffer *eb,void *dst,unsigned long start,unsigned long len); -void write_extent_buffer (struct extent_buffer *eb,const void *src, +void write_extent_buffer (const struct extent_buffer *eb,const void *src,unsigned long start,unsigned long len); void copy_extent_buffer(struct extent_buffer *dst, struct extent_buffer *src, unsigned long dst_offset, unsigned long src_offset,
Signature · 1 line
2.26.3
PATCH v2 18/18 btrfs-progs: sync accessors.[ch] from the kernel
In reply to Josef BacikThis syncs accessors.[ch] from the kernel. For the most part accessors.h will remain the same, there's just some helpers that need to be adjusted for eb->data instead of eb->pages. Additionally accessors.c needed to be completely updated to deal with this as well.
This is a set of files where we will likely only sync the header going forward, and leave the c file in place as it needs to be specific to btrfs-progs.
This forced a few "unrelated" changes
- Using btrfs_dir_item_ftype() instead of btrfs_dir_item_type(). This is due to the encryption changes, and was simpler to just do in this patch.
- Adjusting some of the print tree code to use the actual helpers and not the btrfs-progs ones.
--- Makefile | 1 + check/main.c | 4 +- check/mode-common.c | 4 +- check/mode-lowmem.c | 6 +- cmds/restore.c | 2 +- kerncompat.h | 4 +- kernel-shared/accessors.c | 117 ++++ kernel-shared/accessors.h | 1087 ++++++++++++++++++++++++++++++++++++ kernel-shared/ctree.h | 885 +---------------------------- kernel-shared/dir-item.c | 8 +- kernel-shared/inode.c | 2 +- kernel-shared/print-tree.c | 16 +- libbtrfs/ctree.h | 14 + mkfs/common.c | 1 + 14 files changed, 1255 insertions(+), 896 deletions(-) create mode 100644 kernel-shared/accessors.c create mode 100644 kernel-shared/accessors.h
Makefile +1 -0
@@ -153,6 +153,7 @@ objects = \ kernel-lib/raid56.o \ kernel-lib/rbtree.o \ kernel-lib/tables.o \ + kernel-shared/accessors.o \ kernel-shared/backref.o \ kernel-shared/ctree.o \ kernel-shared/delayed-ref.o \
check/main.c +2 -2
@@ -1435,7 +1435,7 @@ static int process_dir_item(struct extent_buffer *eb,btrfs_dir_item_key_to_cpu (eb, di, &location); name_len =btrfs_dir_name_len (eb, di); data_len =btrfs_dir_data_len (eb, di); - filetype =btrfs_dir_type (eb, di); + filetype =btrfs_dir_ftype (eb, di); rec->found_size += name_len; if (cur + sizeof(*di) + name_len > total ||
@@ -2139,7 +2139,7 @@ static int add_missing_dir_index(struct btrfs_root *root, disk_key.offset =0 ;btrfs_set_dir_item_key (leaf, dir_item, &disk_key); -btrfs_set_dir_type (leaf, dir_item,imode_to_type (rec->imode)); +btrfs_set_dir_flags (leaf, dir_item,imode_to_type (rec->imode));btrfs_set_dir_data_len (leaf, dir_item,0 );btrfs_set_dir_name_len (leaf, dir_item, backref->namelen); name_ptr = (unsigned long )(dir_item +1 );
check/mode-common.c +2 -2
@@ -765,7 +765,7 @@ static int find_file_type_dir_index(struct btrfs_root *root, u64 ino, u64 dirid,if (location.objectid != ino || location.type !=BTRFS_INODE_ITEM_KEY || location.offset !=0 ) goto out; - filetype =btrfs_dir_type (path.nodes[0 ], di); + filetype =btrfs_dir_ftype (path.nodes[0 ], di);if (filetype >=BTRFS_FT_MAX || filetype ==BTRFS_FT_UNKNOWN ) goto out; len = min_t(u32, BTRFS_NAME_LEN,
@@ -824,7 +824,7 @@ static int find_file_type_dir_item(struct btrfs_root *root, u64 ino, u64 dirid, location.type !=BTRFS_INODE_ITEM_KEY || location.offset != 0) continue; - filetype =btrfs_dir_type (path.nodes[0 ], di); + filetype =btrfs_dir_ftype (path.nodes[0 ], di);if (filetype >=BTRFS_FT_MAX || filetype ==BTRFS_FT_UNKNOWN )continue ; len = min_t(u32, BTRFS_NAME_LEN,
check/mode-lowmem.c +3 -3
@@ -869,7 +869,7 @@ loop: location.offset != 0) goto next; - filetype =btrfs_dir_type (node, di); + filetype =btrfs_dir_ftype (node, di);if (file_type != filetype) goto next;
@@ -967,7 +967,7 @@ static int find_dir_item(struct btrfs_root *root, struct btrfs_key *key, location.offset != location_key->offset) goto next; - filetype =btrfs_dir_type (node, di); + filetype =btrfs_dir_ftype (node, di);if (file_type != filetype) goto next;
@@ -1760,7 +1760,7 @@ begin: (*size) += name_len;read_extent_buffer (node, namebuf, (unsigned long )(di +1 ), len); - filetype =btrfs_dir_type (node, di); + filetype =btrfs_dir_ftype (node, di);if (di_key->type ==BTRFS_DIR_ITEM_KEY && di_key->offset !=btrfs_name_hash (namebuf, len)) {
cmds/restore.c +1 -1
@@ -993,7 +993,7 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key, name_len =btrfs_dir_name_len (leaf, dir_item);read_extent_buffer (leaf, filename, name_ptr, name_len); filename[name_len] ='\0' ; - type =btrfs_dir_type (leaf, dir_item); + type =btrfs_dir_ftype (leaf, dir_item);btrfs_dir_item_key_to_cpu (leaf, dir_item, &location);/* full path from root of btrfs being restored */
kerncompat.h +2 -2
@@ -499,9 +499,7 @@ struct __una_u16 { __le16 x; } __attribute__((__packed__));struct __una_u32 {__le32 x; } __attribute__((__packed__ ));struct __una_u64 {__le64 x; } __attribute__((__packed__ )); -#define get_unaligned_le8 (p) (*((u8 *)(p)))#define get_unaligned_8 (p) (*((u8 *)(p))) -#define put_unaligned_le8 (val,p) ((*((u8 *)(p))) = (val))#define put_unaligned_8 (val,p) ((*((u8 *)(p))) = (val))#define get_unaligned_le16 (p) le16_to_cpu(((const struct __una_u16 *)(p))->x)#define get_unaligned_16 (p) (((const struct __una_u16 *)(p))->x)
@@ -575,4 +573,6 @@ static inline bool sb_rdonly(struct super_block *sb) return false; } +#define unlikely (cond) (cond) +#endif
kernel-shared/accessors.c new file +117 -0
117 lines not on this page · raw message
kernel-shared/accessors.h new file +1087 -0
1,087 lines not on this page · raw message
kernel-shared/ctree.h +9 -876
936 lines not on this page · raw message
kernel-shared/dir-item.c +4 -4
@@ -89,7 +89,7 @@ int btrfs_insert_xattr_item(struct btrfs_trans_handle *trans, leaf = path->nodes[0 ];btrfs_cpu_key_to_disk (&disk_key, &location);btrfs_set_dir_item_key (leaf, dir_item, &disk_key); -btrfs_set_dir_type (leaf, dir_item,BTRFS_FT_XATTR ); +btrfs_set_dir_flags (leaf, dir_item,BTRFS_FT_XATTR );btrfs_set_dir_name_len (leaf, dir_item, name_len);btrfs_set_dir_data_len (leaf, dir_item, data_len); name_ptr = (unsigned long )(dir_item +1 );
@@ -141,7 +141,7 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root leaf = path->nodes[0 ];btrfs_cpu_key_to_disk (&disk_key, location);btrfs_set_dir_item_key (leaf, dir_item, &disk_key); -btrfs_set_dir_type (leaf, dir_item, type); +btrfs_set_dir_flags (leaf, dir_item, type);btrfs_set_dir_data_len (leaf, dir_item,0 );btrfs_set_dir_name_len (leaf, dir_item, name_len); name_ptr = (unsigned long )(dir_item +1 );
@@ -170,7 +170,7 @@ insert: leaf = path->nodes[0 ];btrfs_cpu_key_to_disk (&disk_key, location);btrfs_set_dir_item_key (leaf, dir_item, &disk_key); -btrfs_set_dir_type (leaf, dir_item, type); +btrfs_set_dir_flags (leaf, dir_item, type);btrfs_set_dir_data_len (leaf, dir_item,0 );btrfs_set_dir_name_len (leaf, dir_item, name_len); name_ptr = (unsigned long )(dir_item +1 );
@@ -292,7 +292,7 @@ static int verify_dir_item(struct btrfs_root *root, struct btrfs_dir_item *dir_item) {u16 namelen =BTRFS_NAME_LEN ; -u8 type =btrfs_dir_type (leaf, dir_item); +u8 type =btrfs_dir_ftype (leaf, dir_item);if (type ==BTRFS_FT_XATTR ) namelen =XATTR_NAME_MAX ;
kernel-shared/inode.c +1 -1
@@ -548,7 +548,7 @@ int btrfs_mkdir(struct btrfs_trans_handle *trans, struct btrfs_root *root,*/ btrfs_dir_item_key_to_cpu (path->nodes[0 ], dir_item, &found_key); ret_ino = found_key.objectid; -if (btrfs_dir_type (path->nodes[0 ], dir_item) !=BTRFS_FT_DIR ) +if (btrfs_dir_ftype (path->nodes[0 ], dir_item) !=BTRFS_FT_DIR ) ret = -EEXIST ; goto out; }
kernel-shared/print-tree.c +11 -5
@@ -27,11 +27,12 @@#include "kernel-shared/volumes.h" #include "kernel-shared/compression.h" #include "common/utils.h" +#include "accessors.h" static void print_dir_item_type (struct extent_buffer *eb,struct btrfs_dir_item *di) { -u8 type =btrfs_dir_type (eb, di); +u8 type =btrfs_dir_ftype (eb, di);static const char * dir_item_str[] = { [BTRFS_FT_REG_FILE ] ="FILE" , [BTRFS_FT_DIR ] ="DIR" ,
@@ -959,15 +960,20 @@ static void print_disk_balance_args(struct btrfs_disk_balance_args *ba)static void print_balance_item (struct extent_buffer *eb,struct btrfs_balance_item *bi) { +struct btrfs_disk_balance_args ba; +printf ("\t\tbalance status flags %llu\n" , -btrfs_balance_item_flags (eb, bi)); +btrfs_balance_flags (eb, bi));printf ("\t\tDATA\n" ); -print_disk_balance_args (btrfs_balance_item_data (eb, bi)); +btrfs_balance_data (eb, bi, &ba); +print_disk_balance_args (&ba);printf ("\t\tMETADATA\n" ); -print_disk_balance_args (btrfs_balance_item_meta (eb, bi)); +btrfs_balance_meta (eb, bi, &ba); +print_disk_balance_args (&ba);printf ("\t\tSYSTEM\n" ); -print_disk_balance_args (btrfs_balance_item_sys (eb, bi)); +btrfs_balance_sys (eb, bi, &ba); +print_disk_balance_args (&ba); } static void print_dev_stats(struct extent_buffer *eb,
libbtrfs/ctree.h +14 -0
@@ -39,6 +39,20 @@ struct btrfs_trans_handle;struct btrfs_free_space_ctl ;#define BTRFS_MAGIC 0x4D5F53665248425FULL/* ascii _BHRfS_M, no null */ +#define le8_to_cpu (v) (v) +#define cpu_to_le8 (v) (v) +#define __le8 u8 + +static inline u8 get_unaligned_le8 (const void *p) +{ +return *(u8 *)p; +} + +static inline void put_unaligned_le8 (u8 val,void *p) +{ + *(u8 *)p = val; +} +/* * Fake signature for an unfinalized filesystem, which only has barebone tree * structures (normally 6 near empty trees, on SINGLE meta/sys temporary chunks)
mkfs/common.c +1 -0
@@ -39,6 +39,7 @@#include "common/open-utils.h" #include "mkfs/common.h" #include "kernel-shared/uapi/btrfs.h" +#include "kernel-shared/accessors.h" static u64 reference_root_table[] = { [MKFS_ROOT_TREE ] =BTRFS_ROOT_TREE_OBJECTID ,
Signature · 1 line
2.26.3