Menu
▾
▴
[Scst-svn] [master] scst: Port to Linux kernel v6.12
|
From: Gleb C. <lna...@ya...> - 2024-11-07 10:21:54
|
Commit: 256d695 GitHub URL: https://github.com/SCST-project/scst/commit/256d695afaaf8c9c99e31f633825e725cda64a5a Author: Gleb Chesnokov Date: 2024-11-07T13:21:25+03:00 Log Message: ----------- scst: Port to Linux kernel v6.12 Support for the following changes in the Linux kernel v6.12: - 5f60d5f6bbc1 ("move asm/unaligned.h to linux/unaligned.h") - cb787f4ac0c2 ("[tree-wide] finally take no_llseek out") Modified Paths: -------------- fcst/ft_sess.c | 1 - iscsi-scst/include/iscsit_transport.h | 1 - iscsi-scst/kernel/iscsi.c | 1 - iscsi-scst/kernel/isert-scst/isert_login.c | 4 ++++ qla2x00t-32gbit/qla2x00-target/qla_tgt.c | 1 - qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c | 1 - qla2x00t-32gbit/qla_def.h | 5 +++++ qla2x00t-32gbit/qla_dsd.h | 7 +++++++ qla2x00t-32gbit/qla_target.c | 1 - qla2x00t-32gbit/qla_target.h | 2 -- qla2x00t/qla2x00-target/qla2x00t.c | 1 - scst/include/backport.h | 6 +++++- scst/include/scst.h | 6 +++++- scst/src/dev_handlers/scst_cdrom.c | 1 - scst/src/dev_handlers/scst_disk.c | 1 - scst/src/dev_handlers/scst_modisk.c | 1 - scst/src/dev_handlers/scst_tape.c | 1 - scst/src/dev_handlers/scst_vdisk.c | 1 - scst/src/scst_copy_mgr.c | 2 -- scst/src/scst_lib.c | 1 - scst/src/scst_pres.c | 1 - scst/src/scst_tg.c | 1 - 22 files changed, 26 insertions(+), 21 deletions(-) =================================================================== diff --git a/fcst/ft_sess.c b/fcst/ft_sess.c index 5deafb7..237457b 100644 --- a/fcst/ft_sess.c +++ b/fcst/ft_sess.c @@ -19,7 +19,6 @@ #include <linux/module.h> #include <linux/mutex.h> #include <linux/hash.h> -#include <asm/unaligned.h> #include <scsi/libfc.h> #include <scsi/fc/fc_els.h> #include "fcst.h" diff --git a/iscsi-scst/include/iscsit_transport.h b/iscsi-scst/include/iscsit_transport.h index 38603fa..116f724 100644 --- a/iscsi-scst/include/iscsit_transport.h +++ b/iscsi-scst/include/iscsit_transport.h @@ -66,4 +66,3 @@ extern void iscsit_unreg_transport(struct iscsit_transport *t); extern struct iscsit_transport *iscsit_get_transport(enum iscsit_transport_type type); #endif /* __ISCSI_TRANSPORT_H__ */ - diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c index bb367d1..1641b60 100644 --- a/iscsi-scst/kernel/iscsi.c +++ b/iscsi-scst/kernel/iscsi.c @@ -22,7 +22,6 @@ #include <net/tcp.h> #include <scsi/scsi.h> #include <asm/byteorder.h> -#include <asm/unaligned.h> #ifdef INSIDE_KERNEL_TREE #include <scst/iscsit_transport.h> #else diff --git a/iscsi-scst/kernel/isert-scst/isert_login.c b/iscsi-scst/kernel/isert-scst/isert_login.c index 1ae05f9..6516217 100644 --- a/iscsi-scst/kernel/isert-scst/isert_login.c +++ b/iscsi-scst/kernel/isert-scst/isert_login.c @@ -889,7 +889,9 @@ static dev_t devno; static const struct file_operations listener_fops = { .owner = THIS_MODULE, +#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) .llseek = no_llseek, +#endif .read = isert_listen_read, .unlocked_ioctl = isert_listen_ioctl, .compat_ioctl = isert_listen_ioctl, @@ -900,7 +902,9 @@ static const struct file_operations listener_fops = { static const struct file_operations conn_fops = { .owner = THIS_MODULE, +#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) .llseek = no_llseek, +#endif .read = isert_read, .write = isert_write, .unlocked_ioctl = isert_ioctl, diff --git a/qla2x00t-32gbit/qla2x00-target/qla_tgt.c b/qla2x00t-32gbit/qla2x00-target/qla_tgt.c index 36b2896..b1bd5d8 100644 --- a/qla2x00t-32gbit/qla2x00-target/qla_tgt.c +++ b/qla2x00t-32gbit/qla2x00-target/qla_tgt.c @@ -37,7 +37,6 @@ #include <linux/delay.h> #include <linux/list.h> #include <linux/workqueue.h> -#include <asm/unaligned.h> #include <scsi/scsi.h> #include <scsi/scsi_host.h> #include <scsi/scsi_tcq.h> diff --git a/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c b/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c index d30fce6..b7ccd97 100644 --- a/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c +++ b/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c @@ -43,7 +43,6 @@ #include <linux/types.h> #include <linux/delay.h> #include <linux/list.h> -#include <asm/unaligned.h> #include <linux/vmalloc.h> #ifdef INSIDE_KERNEL_TREE #include <scst/scst.h> diff --git a/qla2x00t-32gbit/qla_def.h b/qla2x00t-32gbit/qla_def.h index 733086f..09f4a6c 100644 --- a/qla2x00t-32gbit/qla_def.h +++ b/qla2x00t-32gbit/qla_def.h @@ -28,6 +28,11 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) #include <linux/aer.h> #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) +#include <asm/unaligned.h> +#else +#include <linux/unaligned.h> +#endif #include <linux/mutex.h> #include <linux/btree.h> #include <linux/version.h> diff --git a/qla2x00t-32gbit/qla_dsd.h b/qla2x00t-32gbit/qla_dsd.h index 2078805..1a487d8 100644 --- a/qla2x00t-32gbit/qla_dsd.h +++ b/qla2x00t-32gbit/qla_dsd.h @@ -1,7 +1,14 @@ #ifndef _QLA_DSD_H_ #define _QLA_DSD_H_ +#ifndef INSIDE_KERNEL_TREE +#include <linux/version.h> +#endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) #include <asm/unaligned.h> +#else +#include <linux/unaligned.h> +#endif /* 32-bit data segment descriptor (8 bytes) */ struct dsd32 { diff --git a/qla2x00t-32gbit/qla_target.c b/qla2x00t-32gbit/qla_target.c index 48c4f86..8964148 100644 --- a/qla2x00t-32gbit/qla_target.c +++ b/qla2x00t-32gbit/qla_target.c @@ -23,7 +23,6 @@ #include <linux/delay.h> #include <linux/list.h> #include <linux/workqueue.h> -#include <asm/unaligned.h> #include <scsi/scsi.h> #include <scsi/scsi_host.h> #include <scsi/scsi_tcq.h> diff --git a/qla2x00t-32gbit/qla_target.h b/qla2x00t-32gbit/qla_target.h index 47b80b9..300501d 100644 --- a/qla2x00t-32gbit/qla_target.h +++ b/qla2x00t-32gbit/qla_target.h @@ -19,8 +19,6 @@ #ifndef __QLA_TARGET_H #define __QLA_TARGET_H -#include <linux/version.h> -#include <asm/unaligned.h> #include "qla_def.h" #include "qla_dsd.h" diff --git a/qla2x00t/qla2x00-target/qla2x00t.c b/qla2x00t/qla2x00-target/qla2x00t.c index 06ade1a..93d4987 100644 --- a/qla2x00t/qla2x00-target/qla2x00t.c +++ b/qla2x00t/qla2x00-target/qla2x00t.c @@ -32,7 +32,6 @@ #include <linux/delay.h> #include <linux/list.h> #include <linux/workqueue.h> -#include <asm/unaligned.h> #ifdef INSIDE_KERNEL_TREE #include <scst/scst.h> diff --git a/scst/include/backport.h b/scst/include/backport.h index 7c53e9d..6651a39 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -49,7 +49,11 @@ #include <scsi/scsi_eh.h> /* scsi_build_sense_buffer() */ struct scsi_target; #include <scsi/scsi_transport_fc.h> /* struct bsg_job */ -#include <asm/unaligned.h> /* get_unaligned_be64() */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) +#include <asm/unaligned.h> +#else +#include <linux/unaligned.h> +#endif /* <asm-generic/barrier.h> */ diff --git a/scst/include/scst.h b/scst/include/scst.h index 301d106..ebf5703 100644 --- a/scst/include/scst.h +++ b/scst/include/scst.h @@ -39,10 +39,14 @@ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) #include <linux/sched/signal.h> #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) +#include <asm/unaligned.h> +#else +#include <linux/unaligned.h> +#endif #include <linux/wait.h> #include <linux/cpumask.h> #include <linux/dlm.h> -#include <asm/unaligned.h> #if 0 /* Let's disable it for now to see if users will complain about it */ #define CONFIG_SCST_PER_DEVICE_CMD_COUNT_LIMIT diff --git a/scst/src/dev_handlers/scst_cdrom.c b/scst/src/dev_handlers/scst_cdrom.c index d35be06..b3679c4 100644 --- a/scst/src/dev_handlers/scst_cdrom.c +++ b/scst/src/dev_handlers/scst_cdrom.c @@ -21,7 +21,6 @@ #include <linux/cdrom.h> #include <scsi/scsi_host.h> #include <linux/slab.h> -#include <asm/unaligned.h> #define LOG_PREFIX "dev_cdrom" diff --git a/scst/src/dev_handlers/scst_disk.c b/scst/src/dev_handlers/scst_disk.c index df2f436..d8f932b 100644 --- a/scst/src/dev_handlers/scst_disk.c +++ b/scst/src/dev_handlers/scst_disk.c @@ -26,7 +26,6 @@ #include <linux/blkdev.h> #include <scsi/scsi_host.h> #include <linux/slab.h> -#include <asm/unaligned.h> #define LOG_PREFIX "dev_disk" diff --git a/scst/src/dev_handlers/scst_modisk.c b/scst/src/dev_handlers/scst_modisk.c index ace4336..b096cd9 100644 --- a/scst/src/dev_handlers/scst_modisk.c +++ b/scst/src/dev_handlers/scst_modisk.c @@ -25,7 +25,6 @@ #include <linux/init.h> #include <scsi/scsi_host.h> #include <linux/slab.h> -#include <asm/unaligned.h> #define LOG_PREFIX "dev_modisk" diff --git a/scst/src/dev_handlers/scst_tape.c b/scst/src/dev_handlers/scst_tape.c index 845b98e..f164390 100644 --- a/scst/src/dev_handlers/scst_tape.c +++ b/scst/src/dev_handlers/scst_tape.c @@ -25,7 +25,6 @@ #include <linux/init.h> #include <scsi/scsi_host.h> #include <linux/slab.h> -#include <asm/unaligned.h> #define LOG_PREFIX "dev_tape" diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index 0234743..8512511 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -50,7 +50,6 @@ #include <linux/delay.h> #include <linux/namei.h> #include <asm/div64.h> -#include <asm/unaligned.h> #include <linux/slab.h> #include <linux/bio.h> #include <linux/crc32c.h> diff --git a/scst/src/scst_copy_mgr.c b/scst/src/scst_copy_mgr.c index cf6f077..c6539b4 100644 --- a/scst/src/scst_copy_mgr.c +++ b/scst/src/scst_copy_mgr.c @@ -8,7 +8,6 @@ #include <linux/types.h> #include <linux/init.h> #include <linux/slab.h> -#include <asm/unaligned.h> #include <linux/delay.h> #ifdef INSIDE_KERNEL_TREE @@ -3898,4 +3897,3 @@ void __exit scst_cm_exit(void) TRACE_EXIT(); return; } - diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index 551afba..5dcb8b1 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -32,7 +32,6 @@ #include <linux/ctype.h> #include <linux/delay.h> #include <linux/vmalloc.h> -#include <asm/unaligned.h> #include <asm/checksum.h> #ifndef INSIDE_KERNEL_TREE #include <linux/version.h> diff --git a/scst/src/scst_pres.c b/scst/src/scst_pres.c index b9c330a..aaf1092 100644 --- a/scst/src/scst_pres.c +++ b/scst/src/scst_pres.c @@ -40,7 +40,6 @@ #include <linux/version.h> #endif #include <linux/vmalloc.h> -#include <asm/unaligned.h> #ifdef INSIDE_KERNEL_TREE #include <scst/scst.h> diff --git a/scst/src/scst_tg.c b/scst/src/scst_tg.c index 0b8c72b..de5590a 100644 --- a/scst/src/scst_tg.c +++ b/scst/src/scst_tg.c @@ -18,7 +18,6 @@ #include <linux/moduleparam.h> #include <linux/delay.h> #include <linux/kmod.h> -#include <asm/unaligned.h> #ifdef INSIDE_KERNEL_TREE #include <scst/scst.h> #include <scst/scst_event.h> |
