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 /convert/source-ext2.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 'convert/source-ext2.c')
| -rw-r--r-- | convert/source-ext2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/convert/source-ext2.c b/convert/source-ext2.c index e9277213..e5c2a943 100644 --- a/convert/source-ext2.c +++ b/convert/source-ext2.c @@ -520,7 +520,7 @@ static int ext2_copy_single_xattr(struct btrfs_trans_handle *trans, } strncpy(namebuf, xattr_prefix_table[name_index], XATTR_NAME_MAX); strncat(namebuf, EXT2_EXT_ATTR_NAME(entry), entry->e_name_len); - if (name_len + datalen > BTRFS_LEAF_DATA_SIZE(root) - + if (name_len + datalen > BTRFS_LEAF_DATA_SIZE(root->fs_info) - sizeof(struct btrfs_item) - sizeof(struct btrfs_dir_item)) { fprintf(stderr, "skip large xattr on inode %Lu name %.*s\n", objectid - INO_OFFSET, name_len, namebuf); |