[pve-devel] [PATCH common 3/5] PVE::Syscall: add new mount api constants

Wolfgang Bumiller w.bumiller at proxmox.com
Fri Nov 8 11:06:12 CET 2019


Signed-off-by: Wolfgang Bumiller <w.bumiller at proxmox.com>
---
 src/PVE/Syscall.pm | 69 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

diff --git a/src/PVE/Syscall.pm b/src/PVE/Syscall.pm
index 99e43e7..516e408 100644
--- a/src/PVE/Syscall.pm
+++ b/src/PVE/Syscall.pm
@@ -1,6 +1,7 @@
 package PVE::Syscall;
 
 my %syscalls;
+my %fsmount_constants;
 BEGIN {
     die "syscall.ph can only be required once!\n" if $INC{'syscall.ph'};
     require("syscall.ph");
@@ -15,11 +16,77 @@ BEGIN {
 	faccessat => &SYS_faccessat,
 	setresuid => &SYS_setresuid,
 	fchownat => &SYS_fchownat,
+	mount => &SYS_mount,
+
+	# These use asm-generic, so they're the same across (sane) architectures. We use numbers
+	# since they're not in perl's syscall.ph yet...
+	open_tree => 428,
+	move_mount => 429,
+	fsopen => 430,
+	fsconfig => 431,
+	fsmount => 432,
+	fspick => 433,
+    );
+
+    %fsmount_constants = (
+	OPEN_TREE_CLONE   => 0x0000_0001,
+	OPEN_TREE_CLOEXEC => 000200_0000, # octal!
+
+	MOVE_MOUNT_F_SYMLINKS   => 0x0000_0001,
+	MOVE_MOUNT_F_AUTOMOUNTS => 0x0000_0002,
+	MOVE_MOUNT_F_EMPTY_PATH => 0x0000_0004,
+	MOVE_MOUNT_F_MASK       => 0x0000_0007,
+
+	MOVE_MOUNT_T_SYMLINKS   => 0x0000_0010,
+	MOVE_MOUNT_T_AUTOMOUNTS => 0x0000_0020,
+	MOVE_MOUNT_T_EMPTY_PATH => 0x0000_0040,
+	MOVE_MOUNT_T_MASK       => 0x0000_0070,
+
+	FSMOUNT_CLOEXEC => 0x0000_0001,
+
+	FSOPEN_CLOEXEC => 0x0000_0001,
+
+	MOUNT_ATTR_RDONLY      => 0x0000_0001,
+	MOUNT_ATTR_NOSUID      => 0x0000_0002,
+	MOUNT_ATTR_NODEV       => 0x0000_0004,
+	MOUNT_ATTR_NOEXEC      => 0x0000_0008,
+	MOUNT_ATTR_RELATIME    => 0x0000_0000,
+	MOUNT_ATTR_NOATIME     => 0x0000_0010,
+	MOUNT_ATTR_STRICTATIME => 0x0000_0020,
+	MOUNT_ATTR_NODIRATIME  => 0x0000_0080,
+
+	FSPICK_CLOEXEC          => 0x0000_0001,
+	FSPICK_SYMLINK_NOFOLLOW => 0x0000_0002,
+	FSPICK_NO_AUTOMOUNT     => 0x0000_0004,
+	FSPICK_EMPTY_PATH       => 0x0000_0008,
+
+	FSCONFIG_SET_FLAG        => 0,
+	FSCONFIG_SET_STRING      => 1,
+	FSCONFIG_SET_BINARY      => 2,
+	FSCONFIG_SET_PATH        => 3,
+	FSCONFIG_SET_PATH_EMPTY  => 4,
+	FSCONFIG_SET_FD          => 5,
+	FSCONFIG_CMD_CREATE      => 6,
+	FSCONFIG_CMD_RECONFIGURE => 7,
     );
 };
 
 use constant \%syscalls;
+use constant \%fsmount_constants;
 
 use base 'Exporter';
 
-our @EXPORT_OK   = keys(%syscalls);
+our @EXPORT_OK = (keys(%syscalls), keys(%fsmount_constants), 'file_handle_result');
+our %EXPORT_TAGS = (fsmount => [keys(%fsmount_constants)]);
+
+# Create a file handle from a numeric file descriptor (to make sure it's close()d when it goes out
+# of scope).
+sub file_handle_result($) {
+    my ($fd_num) = @_;
+    return undef if $fd_num < 0;
+
+    open(my $fh, '<&=', $fd_num)
+	or return undef;
+
+    return $fh;
+}
-- 
2.20.1





More information about the pve-devel mailing list