diff options
| author | David Rientjes <rientjes@google.com> | 2010-01-15 12:49:56 -0800 |
|---|---|---|
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2010-01-22 18:33:36 +0200 |
| commit | 7738dd9e8f2bc1c249e00c9c20e018448fac0084 (patch) | |
| tree | 2127dd8ada9cbcf83169e3de823dfe640de0e83a | |
| parent | 84e554e6865c4f4ae84d38800cf270b9a67901cc (diff) | |
| download | blackbird-op-linux-7738dd9e8f2bc1c249e00c9c20e018448fac0084.tar.gz blackbird-op-linux-7738dd9e8f2bc1c249e00c9c20e018448fac0084.zip | |
slub: remove impossible condition
`s' cannot be NULL if kmalloc_caches is not NULL.
This conditional would trigger a NULL pointer on `s', anyway, since it is
immediately derefernced if true.
Acked-by: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
| -rw-r--r-- | mm/slub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c index bddae72f6f49..8fbb2fd70b64 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2641,7 +2641,7 @@ static noinline struct kmem_cache *dma_kmalloc_cache(int index, gfp_t flags) if (slab_state >= SYSFS) slabflags |= __SYSFS_ADD_DEFERRED; - if (!s || !text || !kmem_cache_open(s, flags, text, + if (!text || !kmem_cache_open(s, flags, text, realsize, ARCH_KMALLOC_MINALIGN, slabflags, NULL)) { s->size = 0; kfree(text); |
