tree-wide: s/parse_mntopts/parse_mntopts_legacy/

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 7a248c2685b8d33c180990cd369ac0bf794856ae..c07c2f98351641ecf3fbe66bad39c8bc72f03b62 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2000,7 +2000,7 @@ static int parse_mntopt(char *opt, unsigned long *flags, char **data, size_t siz
        return 0;
 }
 
-int parse_mntopts(const char *mntopts, unsigned long *mntflags, char **mntdata)
+int parse_mntopts_legacy(const char *mntopts, unsigned long *mntflags, char **mntdata)
 {
        __do_free char *mntopts_new = NULL, *mntopts_dup = NULL;
        char *mntopt_cur = NULL;
@@ -2354,7 +2354,7 @@ static inline int mount_entry_on_generic(struct mntent *mntent,
        if (ret < 0)
                return -1;
 
-       ret = parse_mntopts(mntent->mnt_opts, &mntflags, &mntdata);
+       ret = parse_mntopts_legacy(mntent->mnt_opts, &mntflags, &mntdata);
        if (ret < 0)
                return ret;
 

diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index a518e830a5d724976b39f57b12ccb72974d0f86e..da742bdd4bdad071231ff08069f9dc6a54d370af 100644 (file)
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -539,7 +539,7 @@ __hidden extern int userns_exec_1(const struct lxc_conf *conf, int (*fn)(void *)
                                  const char *fn_name);
 __hidden extern int userns_exec_full(struct lxc_conf *conf, int (*fn)(void *), void *data,
                                     const char *fn_name);
-__hidden extern int parse_mntopts(const char *mntopts, unsigned long *mntflags, char **mntdata);
+__hidden extern int parse_mntopts_legacy(const char *mntopts, unsigned long *mntflags, char **mntdata);
 __hidden extern int parse_propagationopts(const char *mntopts, unsigned long *pflags);
 __hidden extern int parse_lxc_mntopts(struct lxc_mount_options *opts, char *mnt_opts);
 __hidden extern void tmp_proc_unmount(struct lxc_conf *lxc_conf);

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 90e5ee9bb85dc012e1af3213d43d61e19a5bbcf0..1d74311daea3725cd217544b43f7572ed9e1d639 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -2803,7 +2803,7 @@ static int set_config_rootfs_options(const char *key, const char *value,
        if (ret < 0)
                return ret;
 
-       ret = parse_mntopts(dup, &mnt_opts->mnt_flags, &mdata);
+       ret = parse_mntopts_legacy(dup, &mnt_opts->mnt_flags, &mdata);
        if (ret < 0)
                return ret_errno(EINVAL);
 

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index 9da78e3f0784a1a0053d02145282eb87b82ed73f..2ad2ef4c1badbf5c3c5cc0f08046fee03232e3ef 100644 (file)
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -359,7 +359,7 @@ static int exec_criu(struct cgroup_ops *cgroup_ops, struct lxc_conf *conf,
                unsigned long flags = 0;
                char arg[2 * PATH_MAX + 2];
 
-               if (parse_mntopts(mntent.mnt_opts, &flags, &mnt_options) < 0)
+               if (parse_mntopts_legacy(mntent.mnt_opts, &flags, &mnt_options) < 0)
                        return log_error_errno(-EINVAL, EINVAL, "Failed to parse mount options");
 
                /* only add --ext-mount-map for actual bind mounts */

diff --git a/src/lxc/storage/btrfs.c b/src/lxc/storage/btrfs.c
index a0ef68c663a561bcd862799e3c756e80a269e627..b115e10bbf8483ffba6f83f61d903e9fa272d68e 100644 (file)
--- a/src/lxc/storage/btrfs.c
+++ b/src/lxc/storage/btrfs.c
@@ -203,7 +203,7 @@ int btrfs_mount(struct lxc_storage *bdev)
        if (!bdev->src || !bdev->dest)
                return -22;
 
-       if (parse_mntopts(bdev->mntopts, &mntflags, &mntdata) < 0) {
+       if (parse_mntopts_legacy(bdev->mntopts, &mntflags, &mntdata) < 0) {
                free(mntdata);
                return -22;
        }

diff --git a/src/lxc/storage/overlay.c b/src/lxc/storage/overlay.c
index 5ff410e1142df11c013d7e3fa321da6e0b13f74a..8fe523973037e0abc968491ded931442275d8c62 100644 (file)
--- a/src/lxc/storage/overlay.c
+++ b/src/lxc/storage/overlay.c
@@ -414,7 +414,7 @@ int ovl_mount(struct lxc_storage *bdev)
        work = must_make_path(upper, LXC_OVERLAY_WORK_DIR, NULL);
        upper[lastslash - upper] = '/';
 
-       ret = parse_mntopts(bdev->mntopts, &mntflags, &mntdata);
+       ret = parse_mntopts_legacy(bdev->mntopts, &mntflags, &mntdata);
        if (ret < 0) {
                ERROR("Failed to parse mount options");
                free(mntdata);

diff --git a/src/lxc/storage/storage_utils.c b/src/lxc/storage/storage_utils.c
index a976256e54960b5679d0007d20f0f6258aa72389..2839f0ce7ce53a92f35efdc48e1f5115e415f659 100644 (file)
--- a/src/lxc/storage/storage_utils.c
+++ b/src/lxc/storage/storage_utils.c
@@ -327,7 +327,7 @@ int find_fstype_cb(char *buffer, void *data)
        DEBUG("Trying to mount \"%s\"->\"%s\" with FSType \"%s\"", cbarg->rootfs,
              cbarg->target, fstype);
 
-       if (parse_mntopts(cbarg->options, &mntflags, &mntdata) < 0) {
+       if (parse_mntopts_legacy(cbarg->options, &mntflags, &mntdata) < 0) {
                free(mntdata);
                return 0;
        }

diff --git a/src/lxc/storage/zfs.c b/src/lxc/storage/zfs.c
index b6a26a1b0dac707d1f6f10caf9d36c10f361dccb..b209d79e0e66a299a922b1b2e80552e89a34f5dc 100644 (file)
--- a/src/lxc/storage/zfs.c
+++ b/src/lxc/storage/zfs.c
@@ -173,7 +173,7 @@ int zfs_mount(struct lxc_storage *bdev)
        if (!bdev->src || !bdev->dest)
                return -22;
 
-       ret = parse_mntopts(bdev->mntopts, &mntflags, &mntdata);
+       ret = parse_mntopts_legacy(bdev->mntopts, &mntflags, &mntdata);
        if (ret < 0) {
                ERROR("Failed to parse mount options");
                return -22;