libmount: move context fs merge to separate function

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

diff --git a/libmount/src/context.c b/libmount/src/context.c
index f925bfaf05c1d3dc393937292e8bef7855fbbea8..4b606cffca7e508c7f1068600e8c92b8a20a7d1c 100644 (file)
--- a/libmount/src/context.c
+++ b/libmount/src/context.c
@@ -2278,12 +2278,51 @@ end:
        return rc;
 }
 
+/* apply @fs to @cxt -- use mnt_context_apply_fstab() if not sure
+ */
+int mnt_context_apply_fs(struct libmnt_context *cxt, struct libmnt_fs *fs)
+{
+       int rc;
+
+       DBG(CXT, ul_debugobj(cxt, "apply entry:"));
+       DBG(CXT, mnt_fs_print_debug(fs, stderr));
+
+       /* copy from fs to our FS description
+        */
+       rc = mnt_fs_set_source(cxt->fs, mnt_fs_get_source(fs));
+       if (!rc)
+               rc = mnt_fs_set_target(cxt->fs, mnt_fs_get_target(fs));
+
+       if (!rc && !mnt_fs_get_fstype(cxt->fs))
+               rc = mnt_fs_set_fstype(cxt->fs, mnt_fs_get_fstype(fs));
+
+       if (!rc && !mnt_fs_get_root(cxt->fs) && mnt_fs_get_root(fs))
+               rc = mnt_fs_set_root(cxt->fs, mnt_fs_get_root(fs));
+
+       if (rc)
+               return rc;
+
+       if (cxt->optsmode & MNT_OMODE_IGNORE)
+               ;
+       else if (cxt->optsmode & MNT_OMODE_REPLACE)
+               rc = mnt_fs_set_options(cxt->fs, mnt_fs_get_options(fs));
+
+       else if (cxt->optsmode & MNT_OMODE_APPEND)
+               rc = mnt_fs_append_options(cxt->fs, mnt_fs_get_options(fs));
+
+       else if (cxt->optsmode & MNT_OMODE_PREPEND)
+               rc = mnt_fs_prepend_options(cxt->fs, mnt_fs_get_options(fs));
+
+       if (!rc)
+               cxt->flags |= MNT_FL_TAB_APPLIED;
+       return rc;
+}
+
 static int apply_table(struct libmnt_context *cxt, struct libmnt_table *tb,
                     int direction)
 {
        struct libmnt_fs *fs = NULL;
        const char *src, *tgt;
-       int rc;
 
        assert(cxt);
        assert(cxt->fs);
@@ -2318,38 +2357,7 @@ static int apply_table(struct libmnt_context *cxt, struct libmnt_table *tb,
        if (!fs)
                return -MNT_ERR_NOFSTAB;        /* not found */
 
-       DBG(CXT, ul_debugobj(cxt, "apply entry:"));
-       DBG(CXT, mnt_fs_print_debug(fs, stderr));
-
-       /* copy from tab to our FS description
-        */
-       rc = mnt_fs_set_source(cxt->fs, mnt_fs_get_source(fs));
-       if (!rc)
-               rc = mnt_fs_set_target(cxt->fs, mnt_fs_get_target(fs));
-
-       if (!rc && !mnt_fs_get_fstype(cxt->fs))
-               rc = mnt_fs_set_fstype(cxt->fs, mnt_fs_get_fstype(fs));
-
-       if (!rc && !mnt_fs_get_root(cxt->fs) && mnt_fs_get_root(fs))
-               rc = mnt_fs_set_root(cxt->fs, mnt_fs_get_root(fs));
-
-       if (rc)
-               return rc;
-
-       if (cxt->optsmode & MNT_OMODE_IGNORE)
-               ;
-       else if (cxt->optsmode & MNT_OMODE_REPLACE)
-               rc = mnt_fs_set_options(cxt->fs, mnt_fs_get_options(fs));
-
-       else if (cxt->optsmode & MNT_OMODE_APPEND)
-               rc = mnt_fs_append_options(cxt->fs, mnt_fs_get_options(fs));
-
-       else if (cxt->optsmode & MNT_OMODE_PREPEND)
-               rc = mnt_fs_prepend_options(cxt->fs, mnt_fs_get_options(fs));
-
-       if (!rc)
-               cxt->flags |= MNT_FL_TAB_APPLIED;
-       return rc;
+       return mnt_context_apply_fs(cxt, fs);
 }
 
 /**

diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
index cba6ff92fc959a55e7c18034949e85e848fb4e04..dd16f8c96c97e0403ed18bae1305b92046341f8a 100644 (file)
--- a/libmount/src/mountP.h
+++ b/libmount/src/mountP.h
@@ -461,6 +461,8 @@ extern int mnt_context_has_template(struct libmnt_context *cxt);
 extern int mnt_context_apply_template(struct libmnt_context *cxt);
 extern int mnt_context_save_template(struct libmnt_context *cxt);
 
+extern int mnt_context_apply_fs(struct libmnt_context *cxt, struct libmnt_fs *fs);
+
 /* tab_update.c */
 extern int mnt_update_set_filename(struct libmnt_update *upd,
                                   const char *filename, int userspace_only);