cptofs: remount as read-only prior to exiting

also umount returns and /proc/self/mounts no longer lists the filesystem, ext4 seems to only flush the filesystem properly after a certain delay. To work around this, we now remount the filesystem as read-only to ensure that it is actually finished by the time we exited Signed-off-by: Jörg Thalheim <[email protected]>
lkl · Oct 12, 2023 · dd6a274 · dd6a274
1 parent 3023e6f
commit dd6a274
Showing 1 changed file with 21 additions and 0 deletions.
diff --git a/tools/lkl/cptofs.c b/tools/lkl/cptofs.c
@@ -675,6 +675,27 @@ int main(int argc, char **argv)
 			break;
 	}
 
+	/* FIXME: Remouting as readonly seems to be required to make sure the filessytem is cleanly umounted. Otherwise the journal will be still dirty... */
+	char dev_str[] = { "/dev/xxxxxxxx" };
+
+	snprintf(dev_str, sizeof(dev_str), "/dev/%08x", disk_id);
+	for (;;) {
+		ret = lkl_sys_mount(dev_str, mpoint, (char *)cla.fsimg_type, LKL_MS_RDONLY|LKL_MS_REMOUNT, NULL);
+		if (ret == 0)
+			break;
+		if (ret == -EBUSY) {
+			struct lkl_timespec ts = {
+				.tv_sec = 1,
+				.tv_nsec = 0,
+			};
+			lkl_sys_nanosleep((struct __lkl__kernel_timespec *)&ts, NULL);
+			continue;
+		} else if (ret < 0) {
+			fprintf(stderr, "cannot remount mount disk read-only: %s\n", lkl_strerror(ret));
+			break;
+		}
+	}
+
 	umount_ret = lkl_umount_dev(disk_id, cla.part, 0, 1000);
 	if (ret == 0)
 		ret = umount_ret;