From adde17cdd844a51fa606c74a0f241c62dbf11a27 Mon Sep 17 00:00:00 2001 From: gaohuatao Date: Fri, 5 Mar 2021 23:13:31 -0500 Subject: [PATCH 50/53] devicemapper: umount when resize2fs command failed Signed-off-by: gaohuatao --- .../storage/layer_store/graphdriver/devmapper/deviceset.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/deviceset.c b/src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/deviceset.c index 0b0394c5..3a271c3a 100644 --- a/src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/deviceset.c +++ b/src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/deviceset.c @@ -2158,14 +2158,15 @@ static int grow_fs(struct device_set *devset, image_devmapper_device_info *info) if (exec_grow_fs_command("resize2fs", dev_fname) != 0) { ERROR("Failed execute resize2fs to grow rootfs"); ret = -1; - goto out; + goto clean_mount; } } else { ERROR("Unsupported filesystem type %s", devset->base_device_filesystem); ret = -1; - goto out; + goto clean_mount; } +clean_mount: if (umount2(FS_MOUNT_POINT, MNT_DETACH) < 0 && errno != EINVAL) { WARN("Failed to umount directory %s:%s", FS_MOUNT_POINT, strerror(errno)); } -- 2.25.1