diff options
Diffstat (limited to 'kernel/tests/include')
-rw-r--r-- | kernel/tests/include/lapi/xloop.h (renamed from kernel/tests/include/lapi/loop.h) | 6 | ||||
-rw-r--r-- | kernel/tests/include/tst_device.h | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/kernel/tests/include/lapi/loop.h b/kernel/tests/include/lapi/xloop.h index 87a9023..8e57b31 100644 --- a/kernel/tests/include/lapi/loop.h +++ b/kernel/tests/include/lapi/xloop.h @@ -8,7 +8,7 @@ #include "config.h" #include <linux/types.h> -#include <linux/loop.h> +#include <linux/xloop.h> #ifndef LO_FLAGS_PARTSCAN # define LO_FLAGS_PARTSCAN 8 @@ -44,10 +44,10 @@ * 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 { +struct xloop_config { __u32 fd; __u32 block_size; - struct loop_info64 info; + struct xloop_info64 info; __u64 __reserved[8]; }; #endif diff --git a/kernel/tests/include/tst_device.h b/kernel/tests/include/tst_device.h index 1d1246e..00687a2 100644 --- a/kernel/tests/include/tst_device.h +++ b/kernel/tests/include/tst_device.h @@ -42,34 +42,34 @@ int tst_is_mounted_at_tmpdir(const char *path); int tst_clear_device(const char *dev); /* - * Finds a free loop device for use and returns the free loopdev minor(-1 for no - * free loopdev). If path is non-NULL, it will be filled with free loopdev path. + * Finds a free xloop device for use and returns the free xloopdev minor(-1 for no + * free xloopdev). If path is non-NULL, it will be filled with free xloopdev path. * */ -int tst_find_free_loopdev(const char *path, size_t path_len); +int tst_find_free_xloopdev(const char *path, size_t path_len); /* - * Attaches a file to a loop device. + * Attaches a file to a xloop device. * - * @dev_path Path to the loop device e.g. /dev/loop0 + * @dev_path Path to the xloop device e.g. /dev/xloop0 * @file_path Path to a file e.g. disk.img * @return Zero on success, non-zero otherwise. */ int tst_attach_device(const char *dev_path, const char *file_path); /* - * Detaches a file from a loop device fd. + * Detaches a file from a xloop device fd. * - * @dev_path Path to the loop device e.g. /dev/loop0 - * @dev_fd a open fd for the loop device + * @dev_path Path to the xloop device e.g. /dev/xloop0 + * @dev_fd a open fd for the xloop device * @return Zero on succes, non-zero otherwise. */ int tst_detach_device_by_fd(const char *dev_path, int dev_fd); /* - * Detaches a file from a loop device. + * Detaches a file from a xloop device. * - * @dev_path Path to the loop device e.g. /dev/loop0 + * @dev_path Path to the xloop device e.g. /dev/xloop0 * @return Zero on succes, non-zero otherwise. * * Internally this function opens the device and calls |