diff options
| -rw-r--r-- | Documentation/blockdev/loop.rst | 2 | ||||
| -rw-r--r-- | Documentation/driver-api/loop-file-fmt.rst | 6 | ||||
| -rw-r--r-- | drivers/block/loop/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/block/loop/loop_file_fmt.c | 4 | ||||
| -rw-r--r-- | drivers/block/loop/loop_file_fmt.h | 8 | ||||
| -rw-r--r-- | drivers/block/loop/loop_file_fmt_qcow_main.c | 2 | ||||
| -rw-r--r-- | drivers/block/loop/loop_file_fmt_raw.c | 6 | ||||
| -rw-r--r-- | include/uapi/linux/loop.h | 8 |
8 files changed, 21 insertions, 17 deletions
diff --git a/Documentation/blockdev/loop.rst b/Documentation/blockdev/loop.rst index a11457479cb4..3a5897a14c8b 100644 --- a/Documentation/blockdev/loop.rst +++ b/Documentation/blockdev/loop.rst @@ -1,3 +1,5 @@ +.. SPDX-License-Identifier: GPL-2.0 + Loopback Block Device ===================== diff --git a/Documentation/driver-api/loop-file-fmt.rst b/Documentation/driver-api/loop-file-fmt.rst index 335fde30f364..b666b19a6e39 100644 --- a/Documentation/driver-api/loop-file-fmt.rst +++ b/Documentation/driver-api/loop-file-fmt.rst @@ -1,3 +1,5 @@ +.. SPDX-License-Identifier: GPL-2.0 + =========================================== Loopback block device file format subsystem =========================================== @@ -48,7 +50,7 @@ Finite state machine To prevent a misuse of the internal file format API, the file format subsystem implements an finite state machine. The state machine consists of two states -and a transition for each internal API function. The state +and a transition for each internal API function. The state *file_fmt_uninitialized* of a loop file format denotes that the file format is already allocated but not initialized. After the initialization, the file format's state is set to *file_fmt_initialized*. In this state, all IO related @@ -66,7 +68,7 @@ The entire implemented finite state machine looks like the following: digraph file_fmt_states { rankdir = LR; - node [ shape = point, label = "" ] ENTRY, EXIT; + node [ shape = point, label = "" ] ENTRY, EXIT; node [ shape = circle, label = "file_fmt_uninitialized" ] UN; node [ shape = doublecircle, label = "file_fmt_initialized" ] IN; subgraph helper { diff --git a/drivers/block/loop/Kconfig b/drivers/block/loop/Kconfig index 238ae96189d7..d227337d53bb 100644 --- a/drivers/block/loop/Kconfig +++ b/drivers/block/loop/Kconfig @@ -67,7 +67,7 @@ config BLK_DEV_CRYPTOLOOP select CRYPTO_CBC depends on BLK_DEV_LOOP ---help--- - Say Y here if you want to be able to use the ciphers that are + Say Y here if you want to be able to use the ciphers that are provided by the CryptoAPI as loop transformation. This might be used as hard disk encryption. diff --git a/drivers/block/loop/loop_file_fmt.c b/drivers/block/loop/loop_file_fmt.c index 706a0caa78c5..ff356f172b7a 100644 --- a/drivers/block/loop/loop_file_fmt.c +++ b/drivers/block/loop/loop_file_fmt.c @@ -197,7 +197,7 @@ int loop_file_fmt_read_aio(struct loop_file_fmt *lo_fmt, } int loop_file_fmt_write(struct loop_file_fmt *lo_fmt, - struct request *rq) + struct request *rq) { struct loop_file_fmt_ops *ops; @@ -304,7 +304,7 @@ ssize_t loop_file_fmt_print_type(u32 file_fmt_type, char *file_fmt_name) { ssize_t len = 0; - switch(file_fmt_type) { + switch (file_fmt_type) { case LO_FILE_FMT_RAW: len = sprintf(file_fmt_name, "%s", "RAW"); break; diff --git a/drivers/block/loop/loop_file_fmt.h b/drivers/block/loop/loop_file_fmt.h index cd62dee60bf7..5c0e49376e98 100644 --- a/drivers/block/loop/loop_file_fmt.h +++ b/drivers/block/loop/loop_file_fmt.h @@ -16,7 +16,7 @@ struct loop_file_fmt; /** * struct loop_file_fmt_ops - File format subsystem operations - * + * * Data structure representing the file format subsystem interface. */ struct loop_file_fmt_ops { @@ -73,8 +73,8 @@ struct loop_file_fmt_ops { /** * struct loop_file_fmt_driver - File format subsystem driver - * - * Data structure to implement file format drivers for the file format + * + * Data structure to implement file format drivers for the file format * subsystem. */ struct loop_file_fmt_driver { @@ -135,7 +135,7 @@ enum { /** * struct loop_file_fmt - Loop file format - * + * * Data structure to use with the file format the loop file format subsystem. */ struct loop_file_fmt { diff --git a/drivers/block/loop/loop_file_fmt_qcow_main.c b/drivers/block/loop/loop_file_fmt_qcow_main.c index d3e456f80803..4fb786b340f7 100644 --- a/drivers/block/loop/loop_file_fmt_qcow_main.c +++ b/drivers/block/loop/loop_file_fmt_qcow_main.c @@ -170,7 +170,7 @@ static void __qcow_file_fmt_compression_exit(struct loop_file_fmt *lo_fmt) } #ifdef CONFIG_DEBUG_FS -static void __qcow_file_fmt_header_to_buf(struct loop_file_fmt* lo_fmt, +static void __qcow_file_fmt_header_to_buf(struct loop_file_fmt *lo_fmt, const struct loop_file_fmt_qcow_header *header) { struct loop_file_fmt_qcow_data *qcow_data = lo_fmt->private_data; diff --git a/drivers/block/loop/loop_file_fmt_raw.c b/drivers/block/loop/loop_file_fmt_raw.c index 1920dcf675fd..134a794cf4ad 100644 --- a/drivers/block/loop/loop_file_fmt_raw.c +++ b/drivers/block/loop/loop_file_fmt_raw.c @@ -108,7 +108,7 @@ out_free_page: } static int raw_file_fmt_read(struct loop_file_fmt *lo_fmt, - struct request *rq) + struct request *rq) { struct bio_vec bvec; struct req_iterator iter; @@ -248,7 +248,7 @@ static int __raw_file_fmt_rw_aio(struct loop_file_fmt *lo_fmt, } static int raw_file_fmt_read_aio(struct loop_file_fmt *lo_fmt, - struct request *rq) + struct request *rq) { return __raw_file_fmt_rw_aio(lo_fmt, rq, READ); } @@ -341,7 +341,7 @@ static int raw_file_fmt_write(struct loop_file_fmt *lo_fmt, } static int raw_file_fmt_write_aio(struct loop_file_fmt *lo_fmt, - struct request *rq) + struct request *rq) { return __raw_file_fmt_rw_aio(lo_fmt, rq, WRITE); } diff --git a/include/uapi/linux/loop.h b/include/uapi/linux/loop.h index 07a9db82d2bd..aa92ba7e6680 100644 --- a/include/uapi/linux/loop.h +++ b/include/uapi/linux/loop.h @@ -82,11 +82,11 @@ struct loop_info64 { /* * Loop file format types */ -#define LO_FILE_FMT_RAW 0 -#define LO_FILE_FMT_QCOW 1 -#define LO_FILE_FMT_VDI 2 +#define LO_FILE_FMT_RAW 0 +#define LO_FILE_FMT_QCOW 1 +#define LO_FILE_FMT_VDI 2 #define LO_FILE_FMT_VMDK 3 -#define MAX_LO_FILE_FMT LO_FILE_FMT_VMDK + 1 +#define MAX_LO_FILE_FMT (LO_FILE_FMT_VMDK + 1) /* * IOCTL commands --- we will commandeer 0x4C ('L') |