umount: Try unmounting even if remounting read-only failed

In the case of some api filesystems remounting read-only fails
while unmounting succeeds.
This commit is contained in:
Jan Janssen
2018-03-12 18:32:26 +01:00
parent 3bc341bee9
commit 8645ffd12b
+7 -4
View File
@@ -519,16 +519,19 @@ static int mount_points_list_umount(MountPoint **head, bool *changed) {
* somehwere else via a bind mount. If we
* explicitly remount the super block of that
* alias read-only we hence should be
* relatively safe regarding keeping dirty an fs
* relatively safe regarding keeping a dirty fs
* we cannot otherwise see.
*
* Since the remount can hang in the instance of
* remote filesystems, we remount asynchronously
* and skip the subsequent umount if it fails */
* and skip the subsequent umount if it fails. */
if (remount_with_timeout(m) < 0) {
if (nonunmountable_path(m->path))
/* Remount failed, but try unmounting anyway,
* unless this is a mount point we want to skip. */
if (nonunmountable_path(m->path)) {
n_failed++;
continue;
continue;
}
}
}