diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-07 17:41:52 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-07 17:41:52 +1000 |
| commit | 0be34db467384a383d3a447ccd5c4aa880b1da11 (patch) | |
| tree | b86d7faf9e6991b27121b1724abc25d2c4362232 /drivers/md/dm-stats.c | |
| parent | de1e69aae2ee1ddc7caaa42835c5265ffbfd4b27 (diff) | |
| parent | e7bdf14d8df77bb938e5ca9ade7de14c94af704b (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/md/dm-stats.c')
| -rw-r--r-- | drivers/md/dm-stats.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c index 0250e7e521ab..6028d8247f58 100644 --- 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; |