diff options
author | Dimitri John Ledkov <xnox@ubuntu.com> | 2016-07-26 13:30:05 +0100 |
---|---|---|
committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2016-07-26 13:30:05 +0100 |
commit | 33c949697e316f17bb5037ae83509f35ce28f6a9 (patch) | |
tree | 41ea985d7efe7c3c1a2f64326d8de1a45de7af33 /cmds-inspect.c | |
parent | affaba87a2797d4d468faad268cc5e21c96c6c16 (diff) |
New upstream release
Diffstat (limited to 'cmds-inspect.c')
-rw-r--r-- | cmds-inspect.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/cmds-inspect.c b/cmds-inspect.c index abe4edf1..dd7b9dd2 100644 --- a/cmds-inspect.c +++ b/cmds-inspect.c @@ -415,7 +415,7 @@ static void adjust_dev_min_size(struct list_head *extents, /* * List of device extents is sorted by descending order of the extent's * end offset. If some extent goes beyond the computed minimum size, - * which initially matches the sum of the lenghts of all extents, + * which initially matches the sum of the lengths of all extents, * we need to check if the extent can be relocated to an hole in the * device between [0, *min_size[ (which is what the resize ioctl does). */ @@ -537,32 +537,33 @@ static int print_min_dev_size(int fd, u64 devid) off); off += sizeof(*sh); extent = (struct btrfs_dev_extent *)(args.buf + off); - off += sh->len; + off += btrfs_search_header_len(sh); - sk->min_objectid = sh->objectid; - sk->min_type = sh->type; - sk->min_offset = sh->offset + 1; + sk->min_objectid = btrfs_search_header_objectid(sh); + sk->min_type = btrfs_search_header_type(sh); + sk->min_offset = btrfs_search_header_offset(sh) + 1; - if (sh->objectid != devid || - sh->type != BTRFS_DEV_EXTENT_KEY) + if (btrfs_search_header_objectid(sh) != devid || + btrfs_search_header_type(sh) != BTRFS_DEV_EXTENT_KEY) continue; len = btrfs_stack_dev_extent_length(extent); min_size += len; - ret = add_dev_extent(&extents, sh->offset, - sh->offset + len - 1, 0); + ret = add_dev_extent(&extents, + btrfs_search_header_offset(sh), + btrfs_search_header_offset(sh) + len - 1, 0); if (!ret && last_pos != (u64)-1 && - last_pos != sh->offset) + last_pos != btrfs_search_header_offset(sh)) ret = add_dev_extent(&holes, last_pos, - sh->offset - 1, 1); + btrfs_search_header_offset(sh) - 1, 1); if (ret) { error("add device extent: %s", strerror(-ret)); ret = 1; goto out; } - last_pos = sh->offset + len; + last_pos = btrfs_search_header_offset(sh) + len; } if (sk->min_type != BTRFS_DEV_EXTENT_KEY || |