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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2020-08-02 20:37:25 -07:00
parent 8f70a32bd3 2bafc3bd51
commit db5448f2ec
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/generate-kernel-patch
View File

@@ -459,8 +459,9 @@ if [ "${include_fcst}" = true ]; then
done
fi
add_file "fcst/Kbuild" \
"drivers/scst/fcst/Makefile"
for f in fcst/Kbuild fcst/Makefile_in-tree; do
[ -e "$f" ] && add_file "$f" "drivers/scst/fcst/Makefile"
done
add_file "fcst/Kconfig" "drivers/scst/fcst/Kconfig"

6
scst/src/scst_lib.c
View File

@@ -3640,7 +3640,7 @@ static int scst_full_len_to_data_len(u32 full_len, u32 block_shift)
u64 res;
u32 rem;
res = full_len << block_shift;
res = (u64)full_len << block_shift;
rem = do_div(res, (1 << block_shift) + (1 << SCST_DIF_TAG_SHIFT));
if (unlikely(rem != 0))
TRACE(TRACE_MINOR, "Reminder %d for full len! (full len%d)",
@@ -3665,7 +3665,7 @@ int scst_cmd_get_expected_transfer_len_data(struct scst_cmd *cmd)
if (!cmd->tgt_dif_data_expected)
return cmd->expected_transfer_len_full;
res = cmd->expected_transfer_len_full << cmd->dev->block_shift;
res = (u64)cmd->expected_transfer_len_full << cmd->dev->block_shift;
rem = do_div(res, cmd->dev->block_size + (1 << SCST_DIF_TAG_SHIFT));
if (unlikely(rem != 0))
TRACE(TRACE_MINOR, "Reminder %d for expected transfer len "
@@ -3691,7 +3691,7 @@ int scst_cmd_get_expected_transfer_len_dif(struct scst_cmd *cmd)
if (!cmd->tgt_dif_data_expected)
return 0;
res = cmd->expected_transfer_len_full << SCST_DIF_TAG_SHIFT;
res = (u64)cmd->expected_transfer_len_full << SCST_DIF_TAG_SHIFT;
rem = do_div(res, cmd->dev->block_size + (1 << SCST_DIF_TAG_SHIFT));
if (unlikely(rem != 0))
TRACE(TRACE_MINOR, "Reminder %d for expected transfer len dif! "