mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-21 20:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2021-11-24 16:39:28 -08:00
parent 69953b3398 5e313fddf4
commit e49a874fab
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fcst/Kbuild
View File

@@ -1,5 +1,5 @@
KBUILD_EXTRA_SYMBOLS=$(src)/../scst/src/Module.symvers
ccflags-y += -I$(src)/../scst/include $(shell ev=$$(basename $$(pwd)); echo "ev=$$ev" >&2; [ "$${ev/uek}" != "$${ev}" ] && ev=$${ev/*.el/} && echo -DUEK_RELEASE=$${ev/uek.*})
ccflags-y += -I$(src)/../scst/include $(shell grep -qw fc_fill_fc_hdr $$(pwd)/include/scsi/fc_encode.h 2>/dev/null && echo -DFC_FILL_FC_HDR_IN_SCSI_FC_ENCODE_H)
obj-$(CONFIG_FCST) += fcst.o

9
fcst/ft_cmd.c
View File

@@ -19,10 +19,15 @@
#include <linux/kernel.h>
#include <linux/types.h>
#include <scsi/libfc.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0) && !defined(UEK_RELEASE)
/*
* See also upstream commit e31ac898ac29 ("scsi: libfc: Move scsi/fc_encode.h
* to libfc"). That commit moved fc_fill_fc_hdr() from <scsi/fc_encode.h> into
* <scsi/fc_frame.h>.
*/
#if defined(FC_FILL_FC_HDR_IN_SCSI_FC_ENCODE_H)
#include <scsi/fc_encode.h>
#else
#include <scsi/fc/fc_ms.h>
#include <scsi/fc_frame.h>
#endif
#include "fcst.h"

9
fcst/ft_io.c
View File

@@ -24,10 +24,15 @@
#include <linux/kernel.h>
#include <linux/types.h>
#include <scsi/libfc.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0) && !defined(UEK_RELEASE)
/*
* See also upstream commit e31ac898ac29 ("scsi: libfc: Move scsi/fc_encode.h
* to libfc"). That commit moved fc_fill_fc_hdr() from <scsi/fc_encode.h> into
* <scsi/fc_frame.h>.
*/
#if defined(FC_FILL_FC_HDR_IN_SCSI_FC_ENCODE_H)
#include <scsi/fc_encode.h>
#else
#include <scsi/fc/fc_ms.h>
#include <scsi/fc_frame.h>
#endif
#include "fcst.h"

2
scst/src/scst_lib.c
View File

@@ -12491,8 +12491,6 @@ int scst_tape_generic_parse(struct scst_cmd *cmd)
shift_left_overflows(cmd->data_len, block_shift) ||
shift_left_overflows(cmd->out_bufflen, block_shift);
EXTRACHECKS_BUG_ON(block_shift < 0);
BUILD_BUG_ON(sizeof(cmd->bufflen) != 4);
BUILD_BUG_ON(sizeof(cmd->out_bufflen) != 4);
if (unlikely(overflow)) {