diff options
| author | Kent Overstreet <kmo@daterainc.com> | 2013-08-17 02:13:15 -0700 |
|---|---|---|
| committer | Kent Overstreet <kmo@daterainc.com> | 2013-11-10 21:55:55 -0800 |
| commit | 2d679fc75678551485df62274edaed452becd16d (patch) | |
| tree | 5ac694ced25578b0b54893f69d74bbcaa65b0b67 /drivers/md/bcache/super.c | |
| parent | 77c320eb46e216c17aee5c943949229ccfed6904 (diff) | |
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>
Diffstat (limited to 'drivers/md/bcache/super.c')
| -rw-r--r-- | drivers/md/bcache/super.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index 74f2e902d87..d3169c0652f 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -761,11 +761,10 @@ static int bcache_device_init(struct bcache_device *d, unsigned block_size, struct request_queue *q; size_t n; - if (!d->stripe_size_bits) - d->stripe_size_bits = 31; + if (!d->stripe_size) + d->stripe_size = 1 << 31; - d->nr_stripes = round_up(sectors, 1 << d->stripe_size_bits) >> - d->stripe_size_bits; + d->nr_stripes = DIV_ROUND_UP_ULL(sectors, d->stripe_size); if (!d->nr_stripes || d->nr_stripes > SIZE_MAX / sizeof(atomic_t)) return -ENOMEM; |