Renamed files from loop to xloop and generate package only in Release mode

15 files changed, 48 insertions, 57 deletions

diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index c850f0a..7cc79dd 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -15,14 +15,17 @@ set(BLK_DEV_XLOOP_MIN_COUNT 8
                CACHE STRING "Number of xloop devices to pre-create at init time")
 set(XLOOP_MAJOR 120
    CACHE STRING "Major number for xloop devices")
+set(XLOOP_CTRL_MINOR 15
+   CACHE STRING "Minor number for xloop-control device")
 
 # print configured settings
 message(STATUS "Kernel module path is " ${KERNEL_DIR})
 message(STATUS "Number of xloop devices to pre-create at init time is " ${BLK_DEV_XLOOP_MIN_COUNT})
 message(STATUS "Major number for xloop devices is " ${XLOOP_MAJOR})
+message(STATUS "Minor number for xloop-control device is " ${XLOOP_CTRL_MINOR})
 
 # set C flags for a Linux kernel module
-set(KERNEL_C_FLAGS "-DCONFIG_BLK_DEV_XLOOP_MIN_COUNT=${BLK_DEV_XLOOP_MIN_COUNT} -DXLOOP_MAJOR=${XLOOP_MAJOR}"
+set(KERNEL_C_FLAGS "-DCONFIG_BLK_DEV_XLOOP_MIN_COUNT=${BLK_DEV_XLOOP_MIN_COUNT} -DXLOOP_MAJOR=${XLOOP_MAJOR} -DXLOOP_CTRL_MINOR=${XLOOP_CTRL_MINOR}"
       CACHE STRING "C flags to be used for building the kernel module")
 # set C flags for the debug mode of a Linux kernel module
 set(KERNEL_C_FLAGS_DEBUG "-g -DDEBUG"
@@ -37,10 +40,10 @@ endif(CMAKE_BUILD_TYPE MATCHES Debug)
 add_kernel_build(prepare ${CMAKE_CURRENT_SOURCE_DIR}/Kbuild)
 
 # xloop main Linux kernel module
-set(KERNEL_MODULE_XLOOP_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/loop_file_fmt.c
-                                     ${CMAKE_CURRENT_SOURCE_DIR}/loop_main.c)
-set(KERNEL_MODULE_XLOOP_HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/loop_file_fmt.h
-                                     ${CMAKE_CURRENT_SOURCE_DIR}/loop_main.h
+set(KERNEL_MODULE_XLOOP_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/xloop_file_fmt.c
+                                     ${CMAKE_CURRENT_SOURCE_DIR}/xloop_main.c)
+set(KERNEL_MODULE_XLOOP_HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/xloop_file_fmt.h
+                                     ${CMAKE_CURRENT_SOURCE_DIR}/xloop_main.h
                                      ${CMAKE_CURRENT_SOURCE_DIR}/uapi)
 add_kernel_module(xloop "${KERNEL_DIR}"
                         "CONFIG_BLK_DEV_XLOOP=m"
@@ -49,9 +52,9 @@ add_kernel_module(xloop "${KERNEL_DIR}"
                         ${CMAKE_CURRENT_BINARY_DIR}/Kbuild)
 
 # xloop_file_fmt_raw Linux kernel module
-set(KERNEL_MODULE_XLOOP_RAW_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/loop_file_fmt_raw.c)
+set(KERNEL_MODULE_XLOOP_RAW_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/xloop_file_fmt_raw.c)
 set(KERNEL_MODULE_XLOOP_RAW_HEADER_FILES )
-add_kernel_module(loop_file_fmt_raw "${KERNEL_DIR}"
+add_kernel_module(xloop_file_fmt_raw "${KERNEL_DIR}"
                                      "CONFIG_BLK_DEV_XLOOP_FILE_FMT_RAW=m"
                                      "${KERNEL_MODULE_XLOOP_RAW_SOURCE_FILES}"
                                      "${KERNEL_MODULE_XLOOP_RAW_HEADER_FILES}"
@@ -59,13 +62,13 @@ add_kernel_module(loop_file_fmt_raw "${KERNEL_DIR}"
                                      xloop)
 
 # xloop_file_fmt_qcow Linux kernel module
-set(KERNEL_MODULE_XLOOP_QCOW_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/loop_file_fmt_qcow_cache.c
-                                          ${CMAKE_CURRENT_SOURCE_DIR}/loop_file_fmt_qcow_cluster.c
-                                          ${CMAKE_CURRENT_SOURCE_DIR}/loop_file_fmt_qcow_main.c)
-set(KERNEL_MODULE_XLOOP_QCOW_HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/loop_file_fmt_qcow_cache.h
-                                          ${CMAKE_CURRENT_SOURCE_DIR}/loop_file_fmt_qcow_cluster.h
-                                          ${CMAKE_CURRENT_SOURCE_DIR}/loop_file_fmt_qcow_main.h)
-add_kernel_module(loop_file_fmt_qcow "${KERNEL_DIR}"
+set(KERNEL_MODULE_XLOOP_QCOW_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/xloop_file_fmt_qcow_cache.c
+                                          ${CMAKE_CURRENT_SOURCE_DIR}/xloop_file_fmt_qcow_cluster.c
+                                          ${CMAKE_CURRENT_SOURCE_DIR}/xloop_file_fmt_qcow_main.c)
+set(KERNEL_MODULE_XLOOP_QCOW_HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/xloop_file_fmt_qcow_cache.h
+                                          ${CMAKE_CURRENT_SOURCE_DIR}/xloop_file_fmt_qcow_cluster.h
+                                          ${CMAKE_CURRENT_SOURCE_DIR}/xloop_file_fmt_qcow_main.h)
+add_kernel_module(xloop_file_fmt_qcow "${KERNEL_DIR}"
                                       "CONFIG_BLK_DEV_XLOOP_FILE_FMT_QCOW=m"
                                       "${KERNEL_MODULE_XLOOP_QCOW_SOURCE_FILES}"
                                       "${KERNEL_MODULE_XLOOP_QCOW_HEADER_FILES}"
diff --git a/kernel/Kbuild b/kernel/Kbuild
index a216066..e3b34ac 100644
--- a/kernel/Kbuild
+++ b/kernel/Kbuild
@@ -2,11 +2,11 @@
 
 # Linux kernel module xloop
 obj-$(CONFIG_BLK_DEV_XLOOP)               += xloop.o
-xloop-objs                                += loop_main.o loop_file_fmt.o
+xloop-objs                                += xloop_main.o xloop_file_fmt.o
 
 # Linux kernel module loop_file_fmt_raw
-obj-$(CONFIG_BLK_DEV_XLOOP_FILE_FMT_RAW)  += loop_file_fmt_raw.o
+obj-$(CONFIG_BLK_DEV_XLOOP_FILE_FMT_RAW)  += xloop_file_fmt_raw.o
 
 # Linux kernel module loop_file_fmt_qcow
-obj-$(CONFIG_BLK_DEV_XLOOP_FILE_FMT_QCOW) += loop_file_fmt_qcow.o
-loop_file_fmt_qcow-objs                   += loop_file_fmt_qcow_main.o loop_file_fmt_qcow_cluster.o loop_file_fmt_qcow_cache.o
\ No newline at end of file
+obj-$(CONFIG_BLK_DEV_XLOOP_FILE_FMT_QCOW) += xloop_file_fmt_qcow.o
+xloop_file_fmt_qcow-objs                  += xloop_file_fmt_qcow_main.o xloop_file_fmt_qcow_cluster.o xloop_file_fmt_qcow_cache.o
\ No newline at end of file
diff --git a/kernel/Makefile b/kernel/Makefile
deleted file mode 100644
index ca9019a..0000000
--- a/kernel/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-include $(PWD)/Kbuild
-
-ifndef KDIR
-	KDIR = /lib/modules/$(shell uname -r)/build
-endif
-
-all:
-	make -C "$(KDIR)" "M=$(PWD)" modules
-
-clean:
-	make -C "$(KDIR)" "M=$(PWD)" clean
diff --git a/kernel/uapi/linux/loop.h b/kernel/uapi/linux/xloop.h
index f93f6ad..1bf13c6 100644
--- a/kernel/uapi/linux/loop.h
+++ b/kernel/uapi/linux/xloop.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-1.0+ WITH Linux-syscall-note */
 /*
- * include/linux/loop.h
+ * include/linux/xloop.h
  *
  * Written by Theodore Ts'o, 3/29/93.
  *
diff --git a/kernel/loop_file_fmt.c b/kernel/xloop_file_fmt.c
index 062ea0d..18672f7 100644
--- a/kernel/loop_file_fmt.c
+++ b/kernel/xloop_file_fmt.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- * loop_file_fmt.c
+ * xloop_file_fmt.c
  *
  * File format subsystem for the xloop device module.
  *
@@ -10,7 +10,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 
-#include "loop_file_fmt.h"
+#include "xloop_file_fmt.h"
 
 /* storage for all registered file format drivers */
 static struct xloop_file_fmt_driver *xloop_file_fmt_drivers[MAX_XLO_FILE_FMT] = {
diff --git a/kernel/loop_file_fmt.h b/kernel/xloop_file_fmt.h
index 38d6a3b..a419f33 100644
--- a/kernel/loop_file_fmt.h
+++ b/kernel/xloop_file_fmt.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- * loop_file_fmt.h
+ * xloop_file_fmt.h
  *
  * File format subsystem for the xloop device module.
  *
@@ -10,7 +10,7 @@
 #ifndef _LINUX_XLOOP_FILE_FMT_H
 #define _LINUX_XLOOP_FILE_FMT_H
 
-#include "loop_main.h"
+#include "xloop_main.h"
 
 struct xloop_file_fmt;
 
diff --git a/kernel/loop_file_fmt_qcow_cache.c b/kernel/xloop_file_fmt_qcow_cache.c
index 4ef772a..c0e19fb 100644
--- a/kernel/loop_file_fmt_qcow_cache.c
+++ b/kernel/xloop_file_fmt_qcow_cache.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- * loop_file_fmt_qcow_cache.c
+ * xloop_file_fmt_qcow_cache.c
  *
  * QCOW file format driver for the xloop device module.
  *
@@ -20,8 +20,8 @@
 #include <linux/fs.h>
 #include <linux/vmalloc.h>
 
-#include "loop_file_fmt_qcow_main.h"
-#include "loop_file_fmt_qcow_cache.h"
+#include "xloop_file_fmt_qcow_main.h"
+#include "xloop_file_fmt_qcow_cache.h"
 
 static inline void *__xloop_file_fmt_qcow_cache_get_table_addr(
 	struct xloop_file_fmt_qcow_cache *c, int table)
diff --git a/kernel/loop_file_fmt_qcow_cache.h b/kernel/xloop_file_fmt_qcow_cache.h
index d2f1010..527d4ae 100644
--- a/kernel/loop_file_fmt_qcow_cache.h
+++ b/kernel/xloop_file_fmt_qcow_cache.h
@@ -14,7 +14,7 @@
 #ifndef _LINUX_XLOOP_FILE_FMT_QCOW_CACHE_H
 #define _LINUX_XLOOP_FILE_FMT_QCOW_CACHE_H
 
-#include "loop_file_fmt.h"
+#include "xloop_file_fmt.h"
 
 struct xloop_file_fmt_qcow_cache_table {
 	s64 offset;
diff --git a/kernel/loop_file_fmt_qcow_cluster.c b/kernel/xloop_file_fmt_qcow_cluster.c
index 593a173..82fbc4f 100644
--- a/kernel/loop_file_fmt_qcow_cluster.c
+++ b/kernel/xloop_file_fmt_qcow_cluster.c
@@ -13,10 +13,10 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 
-#include "loop_file_fmt.h"
-#include "loop_file_fmt_qcow_main.h"
-#include "loop_file_fmt_qcow_cache.h"
-#include "loop_file_fmt_qcow_cluster.h"
+#include "xloop_file_fmt.h"
+#include "xloop_file_fmt_qcow_main.h"
+#include "xloop_file_fmt_qcow_cache.h"
+#include "xloop_file_fmt_qcow_cluster.h"
 
 /*
  * Loads a L2 slice into memory (L2 slices are the parts of L2 tables
diff --git a/kernel/loop_file_fmt_qcow_cluster.h b/kernel/xloop_file_fmt_qcow_cluster.h
index 5078f29..ff3e0a1 100644
--- a/kernel/loop_file_fmt_qcow_cluster.h
+++ b/kernel/xloop_file_fmt_qcow_cluster.h
@@ -13,7 +13,7 @@
 #ifndef _LINUX_XLOOP_FILE_FMT_QCOW_CLUSTER_H
 #define _LINUX_XLOOP_FILE_FMT_QCOW_CLUSTER_H
 
-#include "loop_file_fmt.h"
+#include "xloop_file_fmt.h"
 
 extern int xloop_file_fmt_qcow_cluster_get_offset(struct xloop_file_fmt *xlo_fmt,
 						 u64 offset,
diff --git a/kernel/loop_file_fmt_qcow_main.c b/kernel/xloop_file_fmt_qcow_main.c
index 7c3e360..c1fe34c 100644
--- a/kernel/loop_file_fmt_qcow_main.c
+++ b/kernel/xloop_file_fmt_qcow_main.c
@@ -22,10 +22,10 @@
 #include <linux/vmalloc.h>
 #include <linux/zlib.h>
 
-#include "loop_file_fmt.h"
-#include "loop_file_fmt_qcow_main.h"
-#include "loop_file_fmt_qcow_cache.h"
-#include "loop_file_fmt_qcow_cluster.h"
+#include "xloop_file_fmt.h"
+#include "xloop_file_fmt_qcow_main.h"
+#include "xloop_file_fmt_qcow_cache.h"
+#include "xloop_file_fmt_qcow_cluster.h"
 
 static int __qcow_file_fmt_header_read(struct file *file,
 	struct xloop_file_fmt_qcow_header *header)
diff --git a/kernel/loop_file_fmt_qcow_main.h b/kernel/xloop_file_fmt_qcow_main.h
index 54b94c3..e6031be 100644
--- a/kernel/loop_file_fmt_qcow_main.h
+++ b/kernel/xloop_file_fmt_qcow_main.h
@@ -24,7 +24,7 @@
 #include <linux/debugfs.h>
 #endif
 
-#include "loop_file_fmt.h"
+#include "xloop_file_fmt.h"
 
 #ifdef CONFIG_DEBUG_DRIVER
 #define ASSERT(x)  							\
diff --git a/kernel/loop_file_fmt_raw.c b/kernel/xloop_file_fmt_raw.c
index 11cc8cd..6c205ee 100644
--- a/kernel/loop_file_fmt_raw.c
+++ b/kernel/xloop_file_fmt_raw.c
@@ -21,7 +21,7 @@
 #include <linux/uio.h>
 #include <linux/version.h>
 
-#include "loop_file_fmt.h"
+#include "xloop_file_fmt.h"
 
 static inline loff_t __raw_file_fmt_rq_get_pos(struct xloop_file_fmt *xlo_fmt,
 					       struct request *rq)
diff --git a/kernel/loop_main.c b/kernel/xloop_main.c
index 221b59f..a29b644 100644
--- a/kernel/loop_main.c
+++ b/kernel/xloop_main.c
@@ -1,5 +1,5 @@
 /*
- * loop_main.c
+ * xloop_main.c
  *
  * Written by Theodore Ts'o, 3/29/93
  *
@@ -86,8 +86,8 @@
 #include <linux/debugfs.h>
 #endif
 
-#include "loop_file_fmt.h"
-#include "loop_main.h"
+#include "xloop_file_fmt.h"
+#include "xloop_main.h"
 
 #include <linux/uaccess.h>
 
@@ -2087,12 +2087,12 @@ static const struct file_operations xloop_ctl_fops = {
 };
 
 static struct miscdevice xloop_misc = {
-	.minor		= LOOP_CTRL_MINOR,
+	.minor		= XLOOP_CTRL_MINOR,
 	.name		= "xloop-control",
 	.fops		= &xloop_ctl_fops,
 };
 
-MODULE_ALIAS_MISCDEV(LOOP_CTRL_MINOR);
+MODULE_ALIAS_MISCDEV(XLOOP_CTRL_MINOR);
 MODULE_ALIAS("devname:xloop-control");
 
 static int __init xloop_init(void)
diff --git a/kernel/loop_main.h b/kernel/xloop_main.h
index 1b5851a..b9d0405 100644
--- a/kernel/loop_main.h
+++ b/kernel/xloop_main.h
@@ -15,12 +15,12 @@
 #include <linux/spinlock.h>
 #include <linux/mutex.h>
 #include <linux/kthread.h>
-#include "uapi/linux/loop.h"
+#include "uapi/linux/xloop.h"
 #ifdef CONFIG_DEBUG_FS
 #include <linux/debugfs.h>
 #endif
 
-#include "loop_file_fmt.h"
+#include "xloop_file_fmt.h"
 
 /* Possible states of device */
 enum {