drivers/md/bcache/super.c: use kvmalloc

bcache_device_init uses kmalloc for small requests and vmalloc for those
which are larger than 64 pages.  This alone is a strange criterion.
Moreover kmalloc can fallback to vmalloc on the failure.  Let's simply
use kvmalloc instead as it knows how to handle the fallback properly

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Michal Hocko <[email protected]>
Acked-by: Vlastimil Babka <[email protected]>
Cc: Kent Overstreet <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index 85e3f21c251485ecfd56780110896c05c8429cef..e57353e39168120dccdfe34965ac9360b58fd2db 100644 (file)
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -767,16 +767,12 @@ static int bcache_device_init(struct bcache_device *d, unsigned block_size,
        }
 
        n = d->nr_stripes * sizeof(atomic_t);
-       d->stripe_sectors_dirty = n < PAGE_SIZE << 6
-               ? kzalloc(n, GFP_KERNEL)
-               : vzalloc(n);
+       d->stripe_sectors_dirty = kvzalloc(n, GFP_KERNEL);
        if (!d->stripe_sectors_dirty)
                return -ENOMEM;
 
        n = BITS_TO_LONGS(d->nr_stripes) * sizeof(unsigned long);
-       d->full_dirty_stripes = n < PAGE_SIZE << 6
-               ? kzalloc(n, GFP_KERNEL)
-               : vzalloc(n);
+       d->full_dirty_stripes = kvzalloc(n, GFP_KERNEL);
        if (!d->full_dirty_stripes)
                return -ENOMEM;