basic/linux: import loop.h from kernel 6.14-rc4, and drop missing_loop.h

diff --git a/src/basic/linux/loop.h b/src/basic/linux/loop.h
new file mode 100644 (file)
index 0000000..3d128de
--- /dev/null
+++ b/src/basic/linux/loop.h
@@ -0,0 +1,120 @@
+/* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
+/*
+ * Copyright 1993 by Theodore Ts'o.
+ */
+#ifndef _LINUX_LOOP_H
+#define _LINUX_LOOP_H
+
+
+#define LO_NAME_SIZE   64
+#define LO_KEY_SIZE    32
+
+
+/*
+ * Loop flags
+ */
+enum {
+       LO_FLAGS_READ_ONLY      = 1,
+       LO_FLAGS_AUTOCLEAR      = 4,
+       LO_FLAGS_PARTSCAN       = 8,
+       LO_FLAGS_DIRECT_IO      = 16,
+};
+
+/* LO_FLAGS that can be set using LOOP_SET_STATUS(64) */
+#define LOOP_SET_STATUS_SETTABLE_FLAGS (LO_FLAGS_AUTOCLEAR | LO_FLAGS_PARTSCAN)
+
+/* LO_FLAGS that can be cleared using LOOP_SET_STATUS(64) */
+#define LOOP_SET_STATUS_CLEARABLE_FLAGS (LO_FLAGS_AUTOCLEAR)
+
+/* LO_FLAGS that can be set using LOOP_CONFIGURE */
+#define LOOP_CONFIGURE_SETTABLE_FLAGS (LO_FLAGS_READ_ONLY | LO_FLAGS_AUTOCLEAR \
+                                      | LO_FLAGS_PARTSCAN | LO_FLAGS_DIRECT_IO)
+
+#include <asm/posix_types.h>   /* for __kernel_old_dev_t */
+#include <linux/types.h>       /* for __u64 */
+
+/* Backwards compatibility version */
+struct loop_info {
+       int                lo_number;           /* ioctl r/o */
+       __kernel_old_dev_t lo_device;           /* ioctl r/o */
+       unsigned long      lo_inode;            /* ioctl r/o */
+       __kernel_old_dev_t lo_rdevice;          /* ioctl r/o */
+       int                lo_offset;
+       int                lo_encrypt_type;             /* obsolete, ignored */
+       int                lo_encrypt_key_size;         /* ioctl w/o */
+       int                lo_flags;
+       char               lo_name[LO_NAME_SIZE];
+       unsigned char      lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */
+       unsigned long      lo_init[2];
+       char               reserved[4];
+};
+
+struct loop_info64 {
+       __u64              lo_device;                   /* ioctl r/o */
+       __u64              lo_inode;                    /* ioctl r/o */
+       __u64              lo_rdevice;                  /* ioctl r/o */
+       __u64              lo_offset;
+       __u64              lo_sizelimit;/* bytes, 0 == max available */
+       __u32              lo_number;                   /* ioctl r/o */
+       __u32              lo_encrypt_type;             /* obsolete, ignored */
+       __u32              lo_encrypt_key_size;         /* ioctl w/o */
+       __u32              lo_flags;
+       __u8               lo_file_name[LO_NAME_SIZE];
+       __u8               lo_crypt_name[LO_NAME_SIZE];
+       __u8               lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */
+       __u64              lo_init[2];
+};
+
+/**
+ * struct loop_config - Complete configuration for a loop device.
+ * @fd: fd of the file to be used as a backing file for the loop device.
+ * @block_size: block size to use; ignored if 0.
+ * @info: struct loop_info64 to configure the loop device with.
+ *
+ * This structure is used with the LOOP_CONFIGURE ioctl, and can be used to
+ * atomically setup and configure all loop device parameters at once.
+ */
+struct loop_config {
+       __u32                   fd;
+       __u32                   block_size;
+       struct loop_info64      info;
+       __u64                   __reserved[8];
+};
+
+/*
+ * Loop filter types
+ */
+
+#define LO_CRYPT_NONE          0
+#define LO_CRYPT_XOR           1
+#define LO_CRYPT_DES           2
+#define LO_CRYPT_FISH2         3    /* Twofish encryption */
+#define LO_CRYPT_BLOW          4
+#define LO_CRYPT_CAST128       5
+#define LO_CRYPT_IDEA          6
+#define LO_CRYPT_DUMMY         9
+#define LO_CRYPT_SKIPJACK      10
+#define LO_CRYPT_CRYPTOAPI     18
+#define MAX_LO_CRYPT           20
+
+/*
+ * IOCTL commands --- we will commandeer 0x4C ('L')
+ */
+
+#define LOOP_SET_FD            0x4C00
+#define LOOP_CLR_FD            0x4C01
+#define LOOP_SET_STATUS                0x4C02
+#define LOOP_GET_STATUS                0x4C03
+#define LOOP_SET_STATUS64      0x4C04
+#define LOOP_GET_STATUS64      0x4C05
+#define LOOP_CHANGE_FD         0x4C06
+#define LOOP_SET_CAPACITY      0x4C07
+#define LOOP_SET_DIRECT_IO     0x4C08
+#define LOOP_SET_BLOCK_SIZE    0x4C09
+#define LOOP_CONFIGURE         0x4C0A
+
+/* /dev/loop-control interface */
+#define LOOP_CTL_ADD           0x4C80
+#define LOOP_CTL_REMOVE                0x4C81
+#define LOOP_CTL_GET_FREE      0x4C82
+#endif /* _LINUX_LOOP_H */

diff --git a/src/basic/missing_loop.h b/src/basic/missing_loop.h
deleted file mode 100644 (file)
index 56e46f0..0000000
--- a/src/basic/missing_loop.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-#pragma once
-
-#include <linux/loop.h>
-
-#include "macro.h"
-
-#ifndef LOOP_CONFIGURE
-struct loop_config {
-        __u32 fd;
-        __u32 block_size;
-        struct loop_info64 info;
-        __u64 __reserved[8];
-};
-
-#  define LOOP_CONFIGURE 0x4C0A
-#else
-assert_cc(LOOP_CONFIGURE == 0x4C0A);
-#endif
-
-#ifndef LO_FLAGS_DIRECT_IO
-#  define LO_FLAGS_DIRECT_IO 16
-#  define LOOP_SET_DIRECT_IO 0x4C08
-#else
-assert_cc(LO_FLAGS_DIRECT_IO == 16);
-assert_cc(LOOP_SET_DIRECT_IO == 0x4C08);
-#endif
-
-#ifndef LOOP_SET_BLOCK_SIZE
-#  define LOOP_SET_BLOCK_SIZE 0x4C09
-#else
-assert_cc(LOOP_SET_BLOCK_SIZE == 0x4C09);
-#endif
-
-#ifndef LOOP_SET_STATUS_SETTABLE_FLAGS
-#  define LOOP_SET_STATUS_SETTABLE_FLAGS (LO_FLAGS_AUTOCLEAR | LO_FLAGS_PARTSCAN)
-#else
-assert_cc(LOOP_SET_STATUS_SETTABLE_FLAGS == (LO_FLAGS_AUTOCLEAR | LO_FLAGS_PARTSCAN));
-#endif

diff --git a/src/mountfsd/mountwork.c b/src/mountfsd/mountwork.c
index 2fd610f5d65202d49bcdd715008efe5c0aab585c..96cea432adc5a52020c81a3832af3184b9b6497e 100644 (file)
--- a/src/mountfsd/mountwork.c
+++ b/src/mountfsd/mountwork.c
@@ -4,6 +4,7 @@
 #if WANT_LINUX_FS_H
 #include <linux/fs.h>
 #endif
+#include <linux/loop.h>
 
 #include "sd-daemon.h"
 #include "sd-varlink.h"
@@ -19,7 +20,6 @@
 #include "io-util.h"
 #include "json-util.h"
 #include "main-func.h"
-#include "missing_loop.h"
 #include "missing_mount.h"
 #include "missing_syscall.h"
 #include "namespace-util.h"

diff --git a/src/shared/loop-util.c b/src/shared/loop-util.c
index 9c105a6d13f54affe341d43ee7f42be9f4d9efed..3eba8dcb0733ccd4ee24f2c620667e81ac4c52f1 100644 (file)
--- a/src/shared/loop-util.c
+++ b/src/shared/loop-util.c
@@ -27,7 +27,6 @@
 #include "fs-util.h"
 #include "fileio.h"
 #include "loop-util.h"
-#include "missing_loop.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "random-util.h"

diff --git a/src/test/test-loop-block.c b/src/test/test-loop-block.c
index 921049c3fbf389f49295f8fe9f766273b1fe58f2..c18582795b64250f1fdf30925dc12444b27f8bea 100644 (file)
--- a/src/test/test-loop-block.c
+++ b/src/test/test-loop-block.c
@@ -15,7 +15,6 @@
 #include "fs-util.h"
 #include "gpt.h"
 #include "main-func.h"
-#include "missing_loop.h"
 #include "mkfs-util.h"
 #include "mount-util.h"
 #include "namespace-util.h"