proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-13 12:22:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mount_utils: add mount_filesystem() helper

Browse Source 
that translates between the two mount apis.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2020-07-22 11:45:15 +02:00
parent 7f88a1a2f6
commit 14df702190
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lxc/mount_utils.c
View File

@ -3,16 +3,22 @@
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
#define _GNU_SOURCE 1 #define _GNU_SOURCE 1
#endif #endif
#include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/stat.h>
#include <sys/types.h>
#include "log.h"
#include "macro.h" #include "macro.h"
#include "memory_utils.h" #include "memory_utils.h"
#include "mount_utils.h" #include "mount_utils.h"
#include "syscall_numbers.h" #include "syscall_numbers.h"
#include "syscall_wrappers.h" #include "syscall_wrappers.h"
lxc_log_define(mount_utils, lxc);
int mnt_attributes_new(unsigned int old_flags, unsigned int *new_flags) int mnt_attributes_new(unsigned int old_flags, unsigned int *new_flags)
{ {
unsigned int flags = 0; unsigned int flags = 0;
@ -108,3 +114,27 @@ int mnt_attributes_old(unsigned int new_flags, unsigned int *old_flags)
*old_flags |= flags; *old_flags |= flags;
return new_flags; return new_flags;
} }
int mount_filesystem(const char *fs_name, const char *path, unsigned int attr_flags)
{
__do_close int fsfd = -EBADF;
unsigned int old_flags = 0;
fsfd = fsopen(fs_name, FSOPEN_CLOEXEC);
if (fsfd >= 0) {
__do_close int mfd = -EBADF;
if (fsconfig(fsfd, FSCONFIG_CMD_CREATE, NULL, NULL, 0))
return -1;
mfd = fsmount(fsfd, FSMOUNT_CLOEXEC, attr_flags);
if (mfd < 0)
return -1;
return move_mount(mfd, "", AT_FDCWD, path, MOVE_MOUNT_F_EMPTY_PATH);
}
TRACE("Falling back to old mount api");
mnt_attributes_old(attr_flags, &old_flags);
return mount("none", path, fs_name, old_flags, NULL);
}

2
src/lxc/mount_utils.h
View File

@ -148,4 +148,6 @@ __hidden extern int mnt_attributes_new(unsigned int old_flags, unsigned int *new
__hidden extern int mnt_attributes_old(unsigned int new_flags, unsigned int *old_flags); __hidden extern int mnt_attributes_old(unsigned int new_flags, unsigned int *old_flags);
__hidden extern int mount_filesystem(const char *fs_name, const char *path, unsigned int attr_flags);
#endif /* __LXC_MOUNT_UTILS_H */ #endif /* __LXC_MOUNT_UTILS_H */