Revert "libmount: MNT_OMODE_FORCE usage"

This reverts commit 6f41c5de40629c71a8f79e9be4b94f9a75f9ad21.

diff --git a/libmount/src/context.c b/libmount/src/context.c
index 1c288e550ce564168e3d476cef9c0b2cf81677eb..c902f396e0d76cd8ab320200d7bc84b6bc51c8a6 100644 (file)
--- a/libmount/src/context.c
+++ b/libmount/src/context.c
@@ -2077,7 +2077,6 @@ int mnt_context_apply_fstab(struct libmnt_context *cxt)
        }
 
        if (!src && tgt
-           && !(cxt->optsmode & MNT_OMODE_FORCE)
            && !(cxt->optsmode & MNT_OMODE_FSTAB)
            && !(cxt->optsmode & MNT_OMODE_MTAB)) {
                DBG(CXT, ul_debugobj(cxt, "only target; fstab/mtab not required "
@@ -2089,7 +2088,7 @@ int mnt_context_apply_fstab(struct libmnt_context *cxt)
        ignore_result( mnt_context_get_fs(cxt) );
 
        /* try fstab */
-       if (cxt->optsmode & (MNT_OMODE_FSTAB | MNT_OMODE_FORCE)) {
+       if (cxt->optsmode & MNT_OMODE_FSTAB) {
                DBG(CXT, ul_debugobj(cxt, "trying to apply fstab (src=%s, target=%s)", src, tgt));
                rc = mnt_context_get_fstab(cxt, &tab);
                if (!rc)
@@ -2097,7 +2096,7 @@ int mnt_context_apply_fstab(struct libmnt_context *cxt)
        }
 
        /* try mtab */
-       if (rc < 0 && (cxt->optsmode & (MNT_OMODE_MTAB | MNT_OMODE_FORCE))) {
+       if (rc < 0 && (cxt->optsmode & MNT_OMODE_MTAB)) {
                DBG(CXT, ul_debugobj(cxt, "trying to apply mtab (src=%s, target=%s)", src, tgt));
                if (tgt)
                        rc = mnt_context_get_mtab_for_target(cxt, &tab, tgt);