diff options
| author | Thomas Gleixner | 2017-06-04 15:21:52 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2017-06-04 15:21:52 +0200 |
| commit | 978267b6430c07d62cb38f83e058a3132c52eca1 (patch) | |
| tree | 1a744c8230cd5a72adc363ca93458a748c664abe /mm/slub.c | |
| parent | signal: Remove non-uapi <asm/siginfo.h> (diff) | |
| parent | alarmtimer: Rate limit periodic intervals (diff) | |
| download | kernel-qcow2-linux-978267b6430c07d62cb38f83e058a3132c52eca1.tar.gz kernel-qcow2-linux-978267b6430c07d62cb38f83e058a3132c52eca1.tar.xz kernel-qcow2-linux-978267b6430c07d62cb38f83e058a3132c52eca1.zip | |
Merge branch 'timers/urgent' into WIP.timers
Pick up urgent fixes to avoid conflicts.
Diffstat (limited to 'mm/slub.c')
| -rw-r--r-- | mm/slub.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/slub.c b/mm/slub.c index 57e5156f02be..7449593fca72 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -5512,6 +5512,7 @@ static void memcg_propagate_slab_attrs(struct kmem_cache *s) char mbuf[64]; char *buf; struct slab_attribute *attr = to_slab_attr(slab_attrs[i]); + ssize_t len; if (!attr || !attr->store || !attr->show) continue; @@ -5536,8 +5537,9 @@ static void memcg_propagate_slab_attrs(struct kmem_cache *s) buf = buffer; } - attr->show(root_cache, buf); - attr->store(s, buf, strlen(buf)); + len = attr->show(root_cache, buf); + if (len > 0) + attr->store(s, buf, len); } if (buffer) |