aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Thornber <ejt@redhat.com>2013-05-10 09:37:18 -0400
committerAlasdair G Kergon <agk@redhat.com>2013-05-10 09:37:18 -0400
commit8c5008fac4af85c7a597c4e7f2c328ac90652bc2 (patch)
tree36a644b0f1c4208dd773887dc5061368fe315d11
parentaeed1420a39afb9bd4b7acfcda7a573e349bf27a (diff)
dm cache: replace memcpy with struct assignment
Use struct assignment rather than memcpy in dm cache. Signed-off-by: Joe Thornber <ejt@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
-rw-r--r--drivers/md/dm-cache-metadata.c4
-rw-r--r--drivers/md/dm-cache-target.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/dm-cache-metadata.c b/drivers/md/dm-cache-metadata.c
index 83e995fece88..1af7255bbffb 100644
--- a/drivers/md/dm-cache-metadata.c
+++ b/drivers/md/dm-cache-metadata.c
@@ -1044,7 +1044,7 @@ void dm_cache_metadata_get_stats(struct dm_cache_metadata *cmd,
1044 struct dm_cache_statistics *stats) 1044 struct dm_cache_statistics *stats)
1045{ 1045{
1046 down_read(&cmd->root_lock); 1046 down_read(&cmd->root_lock);
1047 memcpy(stats, &cmd->stats, sizeof(*stats)); 1047 *stats = cmd->stats;
1048 up_read(&cmd->root_lock); 1048 up_read(&cmd->root_lock);
1049} 1049}
1050 1050
@@ -1052,7 +1052,7 @@ void dm_cache_metadata_set_stats(struct dm_cache_metadata *cmd,
1052 struct dm_cache_statistics *stats) 1052 struct dm_cache_statistics *stats)
1053{ 1053{
1054 down_write(&cmd->root_lock); 1054 down_write(&cmd->root_lock);
1055 memcpy(&cmd->stats, stats, sizeof(*stats)); 1055 cmd->stats = *stats;
1056 up_write(&cmd->root_lock); 1056 up_write(&cmd->root_lock);
1057} 1057}
1058 1058
diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c
index 004d7053a5b1..2f3348c76267 100644
--- a/drivers/md/dm-cache-target.c
+++ b/drivers/md/dm-cache-target.c
@@ -1913,7 +1913,7 @@ static int cache_create(struct cache_args *ca, struct cache **result)
1913 ti->discards_supported = true; 1913 ti->discards_supported = true;
1914 ti->discard_zeroes_data_unsupported = true; 1914 ti->discard_zeroes_data_unsupported = true;
1915 1915
1916 memcpy(&cache->features, &ca->features, sizeof(cache->features)); 1916 cache->features = ca->features;
1917 ti->per_bio_data_size = get_per_bio_data_size(cache); 1917 ti->per_bio_data_size = get_per_bio_data_size(cache);
1918 1918
1919 cache->callbacks.congested_fn = cache_is_congested; 1919 cache->callbacks.congested_fn = cache_is_congested;