summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-01-16 03:51:56 +0100
committerLennart Poettering <lennart@poettering.net>2013-01-16 04:03:57 +0100
commit0c08f5cde749bd2818475e487109cd0d413452df (patch)
treeae8ee5f5fc5d9121420b2d7897b260ffc7e67206
parentec76596cab6298ae1fb9d7cbe4ad56f175e87943 (diff)
shutdown: in the final umount loop don't use MNT_FORCE
MNT_FORCE is honoured by NFS and FUSE and allows unmounting of the FS even if consumers still use it. For our brute-force loop we rely on EBUSY being reported as long as a file system is still used by a loopback device or suchlike. Hence, drop MNT_FORCE to make EBUSY reliable.
-rw-r--r--src/core/umount.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/umount.c b/src/core/umount.c
index 96232d38db..c7b6cee079 100644
--- a/src/core/umount.c
+++ b/src/core/umount.c
@@ -442,9 +442,11 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e
)
continue;
- /* Trying to umount. Forcing to umount if busy (only for NFS mounts) */
+ /* Trying to umount. We don't force here since we rely
+ * on busy NFS and FUSE file systems to return EBUSY
+ * until we closed everything on top of them. */
log_info("Unmounting %s.", m->path);
- if (umount2(m->path, MNT_FORCE) == 0) {
+ if (umount2(m->path, 0) == 0) {
if (changed)
*changed = true;