mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-17 10:41:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2020-05-27 19:29:22 -07:00
parent 1cbce8a701 630573ed19
commit d5997e830e
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/generate-kernel-patch
View File

@@ -121,7 +121,7 @@ function specialize_patch {
)
fi
local kver3
set -- ${kver//./ }
set -- ${kver//[.-]/ }
if [ -n "$3" ]; then
kver3=$1.$2.$3
else

2
scst/include/scst_event.h
View File

@@ -23,8 +23,6 @@
#define SCST_EVENT_PATH "/dev/"
#define SCST_EVENT_DEV SCST_EVENT_PATH SCST_EVENT_NAME
#define SCST_EVENT_VERSION_NAME SCST_VERSION_NAME
#define SCST_EVENT_VERSION \
SCST_EVENT_VERSION_NAME "$Revision: 2454 $" SCST_CONST_VERSION
#ifndef aligned_u64
#define aligned_u64 uint64_t __attribute__((aligned(8)))

26
scst/src/scst_targ.c
View File

@@ -2696,19 +2696,19 @@ out_done:
typedef enum scst_exec_res (*scst_local_exec_fn)(struct scst_cmd *cmd);
static scst_local_exec_fn scst_local_fns[256] = {
[COMPARE_AND_WRITE] = scst_cmp_wr_local,
[EXTENDED_COPY] = scst_cm_ext_copy_exec,
[MAINTENANCE_IN] = scst_maintenance_in,
[MAINTENANCE_OUT] = scst_maintenance_out,
[PERSISTENT_RESERVE_IN] = scst_persistent_reserve_in_local,
[PERSISTENT_RESERVE_OUT]= scst_persistent_reserve_out_local,
[RECEIVE_COPY_RESULTS] = scst_cm_rcv_copy_res_exec,
[RELEASE] = scst_release_local,
[RELEASE_10] = scst_release_local,
[REPORT_LUNS] = scst_report_luns_local,
[REQUEST_SENSE] = scst_request_sense_local,
[RESERVE] = scst_reserve_local,
[RESERVE_10] = scst_reserve_local,
[COMPARE_AND_WRITE] = scst_cmp_wr_local,
[EXTENDED_COPY] = scst_cm_ext_copy_exec,
[MAINTENANCE_IN] = scst_maintenance_in,
[MAINTENANCE_OUT] = scst_maintenance_out,
[PERSISTENT_RESERVE_IN] = scst_persistent_reserve_in_local,
[PERSISTENT_RESERVE_OUT] = scst_persistent_reserve_out_local,
[RECEIVE_COPY_RESULTS] = scst_cm_rcv_copy_res_exec,
[RELEASE] = scst_release_local,
[RELEASE_10] = scst_release_local,
[REPORT_LUNS] = scst_report_luns_local,
[REQUEST_SENSE] = scst_request_sense_local,
[RESERVE] = scst_reserve_local,
[RESERVE_10] = scst_reserve_local,
};
static enum scst_exec_res scst_do_local_exec(struct scst_cmd *cmd)