diff options
| author | David Sterba <dsterba@suse.com> | 2017-10-20 01:11:11 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-11-14 15:59:00 +0100 |
| commit | 6519b4a5b461eb12d4c3036b1cc625df2f40786b (patch) | |
| tree | 31ce3574d1329a4a78dc7e2dde557b5c9441c2f9 /image | |
| parent | e05551b0805dc314598548b2e36e82cc4226475e (diff) | |
btrfs-progs: image: pass sanitize mode and name tree separately to sanitize_name
Now sanitize_name and all callees do not depend on metadump_struct.
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'image')
| -rw-r--r-- | image/main.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/image/main.c b/image/main.c index aef4f3f4..91b5be52 100644 --- a/image/main.c +++ b/image/main.c @@ -615,9 +615,9 @@ static void sanitize_xattr(struct extent_buffer *eb, int slot) memset_extent_buffer(eb, 0, data_ptr, data_len); } -static void sanitize_name(struct metadump_struct *md, u8 *dst, - struct extent_buffer *src, struct btrfs_key *key, - int slot) +static void sanitize_name(enum sanitize_mode sanitize, struct rb_root *name_tree, + u8 *dst, struct extent_buffer *src, struct btrfs_key *key, + int slot) { struct extent_buffer *eb; @@ -632,15 +632,13 @@ static void sanitize_name(struct metadump_struct *md, u8 *dst, switch (key->type) { case BTRFS_DIR_ITEM_KEY: case BTRFS_DIR_INDEX_KEY: - sanitize_dir_item(md->sanitize_names, &md->name_tree, eb, slot); + sanitize_dir_item(sanitize, name_tree, eb, slot); break; case BTRFS_INODE_REF_KEY: - sanitize_inode_ref(md->sanitize_names, &md->name_tree, eb, slot, - 0); + sanitize_inode_ref(sanitize, name_tree, eb, slot, 0); break; case BTRFS_INODE_EXTREF_KEY: - sanitize_inode_ref(md->sanitize_names, &md->name_tree, eb, slot, - 1); + sanitize_inode_ref(sanitize, name_tree, eb, slot, 1); break; case BTRFS_XATTR_ITEM_KEY: sanitize_xattr(eb, slot); @@ -678,7 +676,8 @@ static void zero_items(struct metadump_struct *md, u8 *dst, } if (md->sanitize_names && has_name(&key)) { - sanitize_name(md, dst, src, &key, i); + sanitize_name(md->sanitize_names, &md->name_tree, dst, + src, &key, i); continue; } |