Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
index 0250e7e521abcbae456b0552e774d47f507f3dc3..6028d8247f5830cd796356414980ff95a74b1647 100644 (file)
--- a/drivers/md/dm-stats.c
+++ b/drivers/md/dm-stats.c
@@ -146,12 +146,7 @@ static void *dm_kvzalloc(size_t alloc_size, int node)
        if (!claim_shared_memory(alloc_size))
                return NULL;
 
-       if (alloc_size <= KMALLOC_MAX_SIZE) {
-               p = kzalloc_node(alloc_size, GFP_KERNEL | __GFP_NORETRY | __GFP_NOMEMALLOC | __GFP_NOWARN, node);
-               if (p)
-                       return p;
-       }
-       p = vzalloc_node(alloc_size, node);
+       p = kvzalloc_node(alloc_size, GFP_KERNEL | __GFP_NOMEMALLOC, node);
        if (p)
                return p;