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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2018-01-06 14:54:27 -08:00
parent 6797f41ceb 9de081f1a7
commit e10a4485f6
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/kernel-functions
View File

@@ -64,10 +64,22 @@ function download_kernel {
}
function extract_kernel_archive {
local kver="$(kernel_version $1)"
local plevel="$(patchlevel $1)"
local series="$1"
if [ -e "${kernel_sources}/linux-$1.tar.xz" ]; then
xz -cd "${kernel_sources}/linux-$1.tar.xz" | tar xf -
else
elif [ -e "${kernel_sources}/linux-$kver.tar.xz" ]; then
xz -cd "${kernel_sources}/linux-$kver.tar.xz" | tar xf - &&
mv linux-$kver linux-$1
elif [ -e "${kernel_sources}/linux-$1.tar.bz2" ]; then
tar xjf "${kernel_sources}/linux-$1.tar.bz2"
elif [ -e "${kernel_sources}/linux-$kver.tar.bz2" ]; then
tar xjf "${kernel_sources}/linux-$kver.tar.bz2" &&
mv linux-$kver linux-$1
else
return 1
fi
}
@@ -213,6 +225,13 @@ index 3f2793d..96e45ea 100644
EOF
fi
fi
# After patch-v4.14.1[12] has been applied, the execute bit has to be
# set for sync-check.sh since patch can't do that.
for f in "tools/objtool/sync-check.sh"; do
if [ -e "$f" ]; then
chmod a+x "$f"
fi
done
)
rmdir "${tmpdir}"
}

7
scst/src/scst_lib.c
View File

@@ -8083,7 +8083,12 @@ static struct request *blk_make_request(struct request_queue *q,
blk_put_request(rq);
return ERR_PTR(ret);
}
#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
/*
* See also commit commit 0abc2a10389f ("block: fix
* blk_rq_append_bio"). That commit has been backported to
* kernel v4.14.11 as 88da02868f77.
*/
#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 11)
ret = blk_rq_append_bio(rq, bio);
if (unlikely(ret)) {
blk_put_request(rq);