libmount: small cleanup in umount code

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
index 41106fea09f74f6cde794a644b2a50c9d9aaa7d4..967ec336ada3709f45e31980bfd85611d1ada768 100644 (file)
--- a/libmount/src/context_mount.c
+++ b/libmount/src/context_mount.c
@@ -362,7 +362,7 @@ static int evaluate_permissions(struct libmnt_context *cxt)
                /*
                 * user mount
                 */
-               if (!(cxt->flags & MNT_FL_TAB_APPLIED))
+               if (!mnt_context_tab_applied(cxt))
                {
                        DBG(CXT, mnt_debug_h(cxt, "perms: fstab not applied, ignore user mount"));
                        return -EPERM;

diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c
index 766adfde1e7b97d4743413c1647a858eddc5d55a..dc16852c0d6e611888bffceaa974a5ee756ef3b9 100644 (file)
--- a/libmount/src/context_umount.c
+++ b/libmount/src/context_umount.c
@@ -190,6 +190,9 @@ err:
        return rc;
 }
 
+/* this is umount replacement to mnt_context_apply_fstab(), use
+ * mnt_context_tab_applied() to check result.
+ */
 static int lookup_umount_fs(struct libmnt_context *cxt)
 {
        const char *tgt;
@@ -210,7 +213,7 @@ static int lookup_umount_fs(struct libmnt_context *cxt)
                return rc;
        if (rc == 1 || !fs) {
                DBG(CXT, mnt_debug_h(cxt, "umount: cannot find '%s' in mtab", tgt));
-               return 0;
+               return 0;       /* this is correct! */
        }
 
        if (fs != cxt->fs) {
@@ -312,7 +315,7 @@ static int evaluate_permissions(struct libmnt_context *cxt)
 
        DBG(CXT, mnt_debug_h(cxt, "umount: evaluating permissions"));
 
-       if (!(cxt->flags & MNT_FL_TAB_APPLIED)) {
+       if (!mnt_context_tab_applied(cxt)) {
                DBG(CXT, mnt_debug_h(cxt,
                                "cannot find %s in mtab and you are not root",
                                mnt_fs_get_target(cxt->fs)));