diff options
| author | David Sterba <dsterba@suse.com> | 2016-05-03 16:20:52 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-05-11 15:53:16 +0200 |
| commit | 1e4abbdf96cae7cbf17a3bf1376d7a56e78153fa (patch) | |
| tree | b5a669c481040709224fced8b9977632aa882c98 /cmds-inspect.c | |
| parent | 64a4800875956162b8dec799ac70e89cd7502ce8 (diff) | |
btrfs-progs: use ioctl search headers everywhere
Generated by following semantic patch and manually tweaked.
<SmPL>
@@
struct btrfs_ioctl_search_header *SH;
@@
(
- SH->objectid
+ btrfs_search_header_objectid(SH)
|
- SH->offset
+ btrfs_search_header_offset(SH)
|
- SH->transid
+ btrfs_search_header_transid(SH)
|
- SH->len
+ btrfs_search_header_len(SH)
|
- SH->type
+ btrfs_search_header_type(SH)
)
</SmPL>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=112131
Reported-and-tested-by: Anatoly Pugachev <matorola@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'cmds-inspect.c')
| -rw-r--r-- | cmds-inspect.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/cmds-inspect.c b/cmds-inspect.c index abe4edf1..25e8c016 100644 --- a/cmds-inspect.c +++ b/cmds-inspect.c @@ -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 || |