Skip to content

Commit

Permalink
dm snapshot: revert "fix a crash when an origin has no snapshots"
Browse files Browse the repository at this point in the history
Commit 7ee06dd ("dm snapshot: fix a
crash when an origin has no snapshots") introduced a regression in
snapshot merging - causing the lvm2 test lvcreate-cache-snapshot.sh
got stuck in an infinite loop.

Even though commit 7ee06dd was marked
for stable@ the stable team was notified to _not_ backport it.

Fixes: 7ee06dd ("dm snapshot: fix a crash when an origin has no snapshots")
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
  • Loading branch information
Mikulas Patocka authored and Mike Snitzer committed May 25, 2021
1 parent 0c1f319 commit f16dba5
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/md/dm-snap.c
Original file line number Diff line number Diff line change
Expand Up @@ -855,11 +855,12 @@ static int dm_add_exception(void *context, chunk_t old, chunk_t new)
static uint32_t __minimum_chunk_size(struct origin *o)
{
struct dm_snapshot *snap;
unsigned chunk_size = rounddown_pow_of_two(UINT_MAX);
unsigned chunk_size = 0;

if (o)
list_for_each_entry(snap, &o->snapshots, list)
chunk_size = min(chunk_size, snap->store->chunk_size);
chunk_size = min_not_zero(chunk_size,
snap->store->chunk_size);

return (uint32_t) chunk_size;
}
Expand Down

0 comments on commit f16dba5

Please sign in to comment.