On Wed, Jun 25, 2014 at 09:57:32AM +0800, Chen Hanxiao wrote:
Signed-off-by: Chen Hanxiao <chenhanxiao@xxxxxxxxxxxxxx> --- src/lxc/lxc_cgroup.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index 8dfdc60..39e30ad 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -288,8 +288,11 @@ int virLXCCgroupGetMeminfo(virLXCMeminfoPtr meminfo) if (virLXCCgroupGetMemUsage(cgroup, meminfo) < 0) goto cleanup; - virLXCCgroupGetMemSwapTotal(cgroup, meminfo); - virLXCCgroupGetMemSwapUsage(cgroup, meminfo); + if (virLXCCgroupGetMemSwapTotal(cgroup, meminfo) < 0) + goto cleanup; + + if (virLXCCgroupGetMemSwapUsage(cgroup, meminfo) < 0) + goto cleanup; ret = 0; cleanup: -- 1.9.0
ACK && Pushed. Martin
Attachment:
signature.asc
Description: Digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list