Skip to content

Commit

Permalink
dm thin metadata: Remove unused local variable when create thin and snap
Browse files Browse the repository at this point in the history
The local variable disk details is not used during the creating of thin & snap
devices. Remove them from dm-thin-metadata, and add pointer validity check for
pointer value in btree_lookup_raw. Skip memory copy when the caller doesn't need
the value.

Signed-off-by: Huaisheng Ye <yehs1@lenovo.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
  • Loading branch information
Huaisheng Ye authored and Mike Snitzer committed Sep 29, 2020
1 parent f0e90b6 commit 399c9bd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
6 changes: 2 additions & 4 deletions drivers/md/dm-thin-metadata.c
Original file line number Diff line number Diff line change
Expand Up @@ -1051,12 +1051,11 @@ static int __create_thin(struct dm_pool_metadata *pmd,
int r;
dm_block_t dev_root;
uint64_t key = dev;
struct disk_device_details details_le;
struct dm_thin_device *td;
__le64 value;

r = dm_btree_lookup(&pmd->details_info, pmd->details_root,
&key, &details_le);
&key, NULL);
if (!r)
return -EEXIST;

Expand Down Expand Up @@ -1129,12 +1128,11 @@ static int __create_snap(struct dm_pool_metadata *pmd,
dm_block_t origin_root;
uint64_t key = origin, dev_key = dev;
struct dm_thin_device *td;
struct disk_device_details details_le;
__le64 value;

/* check this device is unused */
r = dm_btree_lookup(&pmd->details_info, pmd->details_root,
&dev_key, &details_le);
&dev_key, NULL);
if (!r)
return -EEXIST;

Expand Down
3 changes: 2 additions & 1 deletion drivers/md/persistent-data/dm-btree.c
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,8 @@ static int btree_lookup_raw(struct ro_spine *s, dm_block_t block, uint64_t key,
} while (!(flags & LEAF_NODE));

*result_key = le64_to_cpu(ro_node(s)->keys[i]);
memcpy(v, value_ptr(ro_node(s), i), value_size);
if (v)
memcpy(v, value_ptr(ro_node(s), i), value_size);

return 0;
}
Expand Down

0 comments on commit 399c9bd

Please sign in to comment.