Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 375258
b: refs/heads/master
c: 8c5008f
h: refs/heads/master
v: v3
  • Loading branch information
Joe Thornber authored and Alasdair G Kergon committed May 10, 2013
1 parent 92b55e0 commit f394975
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aeed1420a39afb9bd4b7acfcda7a573e349bf27a
refs/heads/master: 8c5008fac4af85c7a597c4e7f2c328ac90652bc2
4 changes: 2 additions & 2 deletions trunk/drivers/md/dm-cache-metadata.c
Original file line number Diff line number Diff line change
Expand Up @@ -1044,15 +1044,15 @@ void dm_cache_metadata_get_stats(struct dm_cache_metadata *cmd,
struct dm_cache_statistics *stats)
{
down_read(&cmd->root_lock);
memcpy(stats, &cmd->stats, sizeof(*stats));
*stats = cmd->stats;
up_read(&cmd->root_lock);
}

void dm_cache_metadata_set_stats(struct dm_cache_metadata *cmd,
struct dm_cache_statistics *stats)
{
down_write(&cmd->root_lock);
memcpy(&cmd->stats, stats, sizeof(*stats));
cmd->stats = *stats;
up_write(&cmd->root_lock);
}

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/md/dm-cache-target.c
Original file line number Diff line number Diff line change
Expand Up @@ -1913,7 +1913,7 @@ static int cache_create(struct cache_args *ca, struct cache **result)
ti->discards_supported = true;
ti->discard_zeroes_data_unsupported = true;

memcpy(&cache->features, &ca->features, sizeof(cache->features));
cache->features = ca->features;
ti->per_bio_data_size = get_per_bio_data_size(cache);

cache->callbacks.congested_fn = cache_is_congested;
Expand Down

0 comments on commit f394975

Please sign in to comment.