diff options
| author | Gu Jinxiang <gujx@cn.fujitsu.com> | 2018-01-26 15:26:00 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-02-02 16:01:56 +0100 |
| commit | 26072f584d347ef2d471c02fbe27dbfedd606ac4 (patch) | |
| tree | c9b94490710d5eefdc23db5e3925d622b198387f /cmds-check.c | |
| parent | c449c391f5ec88e903f7a6b82bb3fc55f261c35b (diff) | |
btrfs-progs: Use fs_info instead of root for BTRFS_LEAF_DATA_SIZE
Do a cleanup. Also make it consistent with kernel. Use fs_info instead
of root for BTRFS_LEAF_DATA_SIZE, since maybe in some situation we do
not know root, but just know fs_info.
Signed-off-by: Gu Jinxiang <gujx@cn.fujitsu.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'cmds-check.c')
| -rw-r--r-- | cmds-check.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmds-check.c b/cmds-check.c index 99fbafc5..02371a0a 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -7233,9 +7233,9 @@ again: unsigned int shift = 0, offset; if (i == 0 && btrfs_item_end_nr(buf, i) != - BTRFS_LEAF_DATA_SIZE(root)) { + BTRFS_LEAF_DATA_SIZE(root->fs_info)) { if (btrfs_item_end_nr(buf, i) > - BTRFS_LEAF_DATA_SIZE(root)) { + BTRFS_LEAF_DATA_SIZE(root->fs_info)) { ret = delete_bogus_item(root, path, buf, i); if (!ret) goto again; @@ -7244,7 +7244,7 @@ again: ret = -EIO; break; } - shift = BTRFS_LEAF_DATA_SIZE(root) - + shift = BTRFS_LEAF_DATA_SIZE(root->fs_info) - btrfs_item_end_nr(buf, i); } else if (i > 0 && btrfs_item_end_nr(buf, i) != btrfs_item_offset_nr(buf, i - 1)) { |