Merge remote-tracking branch 'device-mapper/for-next'

[karo-tx-linux.git] / drivers / md / dm-snap-persistent.c

diff --git a/drivers/md/dm-snap-persistent.c b/drivers/md/dm-snap-persistent.c
index 117a05e40090a9b78829ed415446d906c8268701..3164b8bce2948591999f429e4633235c1f7b1062 100644 (file)
--- a/drivers/md/dm-snap-persistent.c
+++ b/drivers/md/dm-snap-persistent.c
@@ -322,7 +322,7 @@ static int read_header(struct pstore *ps, int *new_snapshot)
                    bdev_logical_block_size(dm_snap_cow(ps->store->snap)->
                                            bdev) >> 9);
                ps->store->chunk_mask = ps->store->chunk_size - 1;
-               ps->store->chunk_shift = ffs(ps->store->chunk_size) - 1;
+               ps->store->chunk_shift = __ffs(ps->store->chunk_size);
                chunk_size_supplied = 0;
        }