Merge "fs_mgr: error check umount calls / add retry logic" (17b5b352) · Commits · e / os / android_system_core

fs_mgr/fs_mgr.c

+13 −3

Original line number	Diff line number	Diff line
		@@ -119,7 +119,17 @@ static void check_fs(char blk_device, char fs_type, char *target)
		ret = mount(blk_device, target, fs_type, tmpmnt_flags, tmpmnt_opts);
		INFO("%s(): mount(%s,%s,%s)=%d\n", __func__, blk_device, target, fs_type, ret);
		if (!ret) {
		umount(target);
		int i;
		for (i = 0; i < 5; i++) {
		// Try to umount 5 times before continuing on.
		// Should we try rebooting if all attempts fail?
		int result = umount(target);
		if (result == 0) {
		break;
		}
		ERROR("%s(): umount(%s)=%d: %s\n", __func__, target, result, strerror(errno));
		sleep(1);
		}
		}

		/*
		@@ -488,8 +498,8 @@ int fs_mgr_mount_all(struct fstab *fstab)
		encryptable = FS_MGR_MNTALL_DEV_MIGHT_BE_ENCRYPTED;
		}
		} else {
		INFO("Could not umount %s - allow continue unencrypted\n",
		fstab->recs[attempted_idx].mount_point);
		WARNING("Could not umount %s (%s) - allow continue unencrypted\n",
		fstab->recs[attempted_idx].mount_point, strerror(errno));
		continue;
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#include <fs_mgr.h>

		#define INFO(x...) KLOG_INFO("fs_mgr", x)
		#define WARNING(x...) KLOG_WARNING("fs_mgr", x)
		#define ERROR(x...) KLOG_ERROR("fs_mgr", x)

		#define CRYPTO_TMPFS_OPTIONS "size=256m,mode=0771,uid=1000,gid=1000"