mount_utils: kill mount_from_at()

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

diff --git a/src/lxc/mount_utils.c b/src/lxc/mount_utils.c
index fa02d23d67913c86cf8ff9ea25b8e1a06c4164c2..363c0756a28ab4e09cb170a38b4c4adca35d6e3c 100644 (file)
--- a/src/lxc/mount_utils.c
+++ b/src/lxc/mount_utils.c
@@ -255,55 +255,6 @@ int fs_attach(int fd_fs,
        return 0;
 }
 
-int mount_from_at(int dfd_from, const char *path_from,
-                 __u64 o_flags_from,
-                 __u64 resolve_flags_from,
-                 int dfd_to, const char *path_to,
-                 __u64 o_flags_to,
-                 __u64 resolve_flags_to,
-                 const char *fstype, unsigned int mnt_flags, const void *data)
-{
-       __do_close int fd_from = -EBADF, fd_to = -EBADF;
-       struct lxc_open_how how = {};
-       int ret;
-       char src_buf[LXC_PROC_PID_FD_LEN], dst_buf[LXC_PROC_PID_FD_LEN];
-
-       if (is_empty_string(path_from)) {
-               ret = snprintf(src_buf, sizeof(src_buf), "/proc/self/fd/%d", dfd_from);
-       } else {
-               how.flags       = o_flags_from;
-               how.resolve     = resolve_flags_from;
-               fd_from = openat2(dfd_from, path_from, &how, sizeof(how));
-               if (fd_from < 0)
-                       return -errno;
-
-               ret = snprintf(src_buf, sizeof(src_buf), "/proc/self/fd/%d", fd_from);
-       }
-       if (ret < 0 || ret >= sizeof(src_buf))
-               return -EIO;
-
-       if (is_empty_string(path_to)) {
-               ret = snprintf(dst_buf, sizeof(dst_buf), "/proc/self/fd/%d", dfd_to);
-       } else {
-               how.flags       = o_flags_to;
-               how.resolve     = resolve_flags_to;
-               fd_to = openat2(dfd_to, path_to, &how, sizeof(how));
-               if (fd_to < 0)
-                       return -errno;
-
-               ret = snprintf(dst_buf, sizeof(dst_buf), "/proc/self/fd/%d", fd_to);
-       }
-       if (ret < 0 || ret >= sizeof(src_buf))
-               return -EIO;
-
-       if (is_empty_string(src_buf))
-               ret = mount(NULL, dst_buf, fstype, mnt_flags, data);
-       else
-               ret = mount(src_buf, dst_buf, fstype, mnt_flags, data);
-
-       return ret;
-}
-
 int fd_bind_mount(int dfd_from, const char *path_from,
                  __u64 o_flags_from, __u64 resolve_flags_from,
                  int dfd_to, const char *path_to,

diff --git a/src/lxc/mount_utils.h b/src/lxc/mount_utils.h
index cced086c40d426dad50a3ec30d3800d10e72e211..9ba964de227402edc3f619526c8d65f12780aaab 100644 (file)
--- a/src/lxc/mount_utils.h
+++ b/src/lxc/mount_utils.h
@@ -157,12 +157,6 @@ __hidden extern int mnt_attributes_old(unsigned int new_flags, unsigned int *old
 
 __hidden extern int mount_filesystem(const char *fs_name, const char *path, unsigned int attr_flags);
 
-__hidden extern int mount_from_at(int dfd_from, const char *path_from,
-                                 __u64 o_flags_from, __u64 resolve_flags_from,
-                                 int dfd_to, const char *path_to,
-                                 __u64 o_flags_to, __u64 resolve_flags_to,
-                                 const char *fstype, unsigned int mnt_flags,
-                                 const void *data);
 __hidden extern int fs_prepare(const char *fs_name, int dfd_from,
                               const char *path_from, __u64 o_flags_from,
                               __u64 resolve_flags_from);