summaryrefslogtreecommitdiffstats
path: root/shlibs/mount/src/context_umount.c
diff options
context:
space:
mode:
authorKarel Zak2010-12-03 21:13:52 +0100
committerKarel Zak2011-01-03 12:28:47 +0100
commit77417bc00d76086d3cb5876f6fd52d5369c918a4 (patch)
treec71c225182ee80b5df388ab8a01c65500a8770e3 /shlibs/mount/src/context_umount.c
parentlibmount: fix to work with btrfs subvolume user mounts (diff)
downloadkernel-qcow2-util-linux-77417bc00d76086d3cb5876f6fd52d5369c918a4.tar.gz
kernel-qcow2-util-linux-77417bc00d76086d3cb5876f6fd52d5369c918a4.tar.xz
kernel-qcow2-util-linux-77417bc00d76086d3cb5876f6fd52d5369c918a4.zip
libmount: remove utab from API, update tests
The utab file is private libmount stuff. Anything about utab should not be exported by library API. Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'shlibs/mount/src/context_umount.c')
-rw-r--r--shlibs/mount/src/context_umount.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/shlibs/mount/src/context_umount.c b/shlibs/mount/src/context_umount.c
index ca9ca7749..ec5713004 100644
--- a/shlibs/mount/src/context_umount.c
+++ b/shlibs/mount/src/context_umount.c
@@ -502,9 +502,8 @@ int mnt_context_do_umount(mnt_context *cxt)
if (!rc)
rc = __mnt_fs_set_optstr_ptr(cxt->fs, n, FALSE);
- if (!rc && cxt->update &&
- !mnt_update_is_userspace_only(cxt->update))
- /* refresh options in /etc/mtab as well*/
+ /* refresh options in /etc/mtab as well */
+ if (!rc && cxt->update && cxt->mtab_writable)
rc = mnt_update_set_fs(cxt->update,
cxt->mountflags, NULL, cxt->fs);
}