diff options
| author | Gary Robertson <gary.robertson@linaro.org> | 2013-10-31 17:57:05 -0700 |
|---|---|---|
| committer | Gary Robertson <gary.robertson@linaro.org> | 2013-10-31 17:57:05 -0700 |
| commit | b7fbb07e1d6744e87079a12dc29f7c2fb8205c26 (patch) | |
| tree | e51ff461b46a470c81d62c6d86853187646624c3 /drivers/md/dm-snap.c | |
| parent | 4da2c19b694dd0e5932cee3eeb40df3e637628cc (diff) | |
| parent | cac65253a9c5a30d4c8d7bc4c60197935f9e2e70 (diff) | |
Merge tag 'v3.10.15' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-v3.10.15-final
This is the 3.10.15 stable release
Diffstat (limited to 'drivers/md/dm-snap.c')
| -rw-r--r-- | drivers/md/dm-snap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c index c434e5aab2df..aec57d76db5d 100644 --- a/drivers/md/dm-snap.c +++ b/drivers/md/dm-snap.c @@ -725,17 +725,16 @@ static int calc_max_buckets(void) */ static int init_hash_tables(struct dm_snapshot *s) { - sector_t hash_size, cow_dev_size, origin_dev_size, max_buckets; + sector_t hash_size, cow_dev_size, max_buckets; /* * Calculate based on the size of the original volume or * the COW volume... */ cow_dev_size = get_dev_size(s->cow->bdev); - origin_dev_size = get_dev_size(s->origin->bdev); max_buckets = calc_max_buckets(); - hash_size = min(origin_dev_size, cow_dev_size) >> s->store->chunk_shift; + hash_size = cow_dev_size >> s->store->chunk_shift; hash_size = min(hash_size, max_buckets); if (hash_size < 64) |