From 6f7f51f793e5f2a5d42e05e3f1e3101f49d37299 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 5 May 2011 12:26:31 +0200 Subject: umount: umount, until all umounts failed --- src/umount.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/umount.c') diff --git a/src/umount.c b/src/umount.c index 290e6cad02..20db612ace 100644 --- a/src/umount.c +++ b/src/umount.c @@ -552,6 +552,8 @@ static int dm_points_list_detach(MountPoint **head, bool *changed) { int umount_all(bool *changed) { int r; + bool umount_changed; + LIST_HEAD(MountPoint, mp_list_head); LIST_HEAD_INIT(MountPoint, mp_list_head); @@ -560,7 +562,13 @@ int umount_all(bool *changed) { if (r < 0) goto end; - r = mount_points_list_umount(&mp_list_head, changed); + /* retry umount, until nothing can be umounted anymore */ + do { + umount_changed = false; + r = mount_points_list_umount(&mp_list_head, &umount_changed); + if (umount_changed) + *changed = true; + } while(umount_changed); if (r <= 0) goto end; -- cgit v1.2.3-54-g00ecf