diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-06-08 12:11:49 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-06-08 12:11:49 +0800 |
| commit | dfb9fdffcea66d74eb9fbe4318471450242790dd (patch) | |
| tree | 5252eebc058a0df384788aad7e956b9ab06713b6 /mm/slub.c | |
| parent | 9fd33d009e8cc0363961601fcdf4eeae1ce624d7 (diff) | |
| parent | 4bbbc769640554a216a25b2dbaa3d4d2869bbf79 (diff) | |
Merge tag 'v4.4.71' into linux-linaro-lsk-v4.4
This is the 4.4.71 stable release
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 41f7cae64a49..d6fe997c0577 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -5343,6 +5343,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; @@ -5367,8 +5368,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) |