bcache: Stripe size isn't necessarily a power of two

Originally I got this right... except that the divides didn't use
do_div(), which broke 32 bit kernels. When I went to fix that, I forgot
that the raid stripe size usually isn't a power of two... doh

Signed-off-by: Kent Overstreet <kmo@daterainc.com>
This commit is contained in:
Kent Overstreet
2013-08-17 02:13:15 -07:00
parent 77c320eb46
commit 2d679fc756
5 changed files with 27 additions and 25 deletions

View File

@@ -18,16 +18,18 @@ static inline bool bcache_dev_stripe_dirty(struct bcache_device *d,
uint64_t offset,
unsigned nr_sectors)
{
uint64_t stripe = offset >> d->stripe_size_bits;
uint64_t stripe = offset;
do_div(stripe, d->stripe_size);
while (1) {
if (atomic_read(d->stripe_sectors_dirty + stripe))
return true;
if (nr_sectors <= 1 << d->stripe_size_bits)
if (nr_sectors <= d->stripe_size)
return false;
nr_sectors -= 1 << d->stripe_size_bits;
nr_sectors -= d->stripe_size;
stripe++;
}
}