diff options
| author | Karel Zak <kzak@redhat.com> | 2013-09-27 10:06:09 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2013-09-27 10:06:09 +0200 |
| commit | c410f64734cb8a67e3396d924b4b475022c9494e (patch) | |
| tree | 678db0cf44959dcb90659c9461d93a781164232f /libmount/src | |
| parent | 2ab413a6891be621e92cd4d28dd062e38e736d64 (diff) | |
| download | util-linux-c410f64734cb8a67e3396d924b4b475022c9494e.tar.gz | |
libmount: small cleanup in umount code
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libmount/src')
| -rw-r--r-- | libmount/src/context_mount.c | 2 | ||||
| -rw-r--r-- | libmount/src/context_umount.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c index 41106fea..967ec336 100644 --- 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 766adfde..dc16852c 100644 --- 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))); |