mirror of
https://github.com/SCST-project/scst.git
synced 2026-09-28 18:55:40 +00:00
Merged revisions 7233-7244 via svnmerge from
svn+ssh://svn.code.sf.net/p/scst/svn/trunk ........ r7233 | bvassche | 2017-09-20 08:09:38 -0700 (Wed, 20 Sep 2017) | 4 lines ib_srpt: Support systems with more than 255 CPU cores Signed-off-by: Kirill Malkin <kirillmalkin.km@gmail.com> ........ r7234 | bvassche | 2017-09-24 18:52:53 -0700 (Sun, 24 Sep 2017) | 2 lines iscsi-scst/Makefile: Change MOFED path into /usr/src/ofa_kernel/default ........ r7235 | bvassche | 2017-09-25 16:35:49 -0700 (Mon, 25 Sep 2017) | 1 line iscsi-scst/Makefile, Ubuntu: Simplify code for version querying ........ r7236 | bvassche | 2017-10-02 16:56:47 -0700 (Mon, 02 Oct 2017) | 1 line scripts/specialize-patch: Process ENABLE_NPIV and FC_VPORT_CREATE_DEFINED correctly ........ r7237 | bvassche | 2017-10-02 17:04:53 -0700 (Mon, 02 Oct 2017) | 2 lines scripts/generate-kernel-patch: Fix a regression introduced in r7164 ........ r7238 | bvassche | 2017-10-02 17:05:42 -0700 (Mon, 02 Oct 2017) | 1 line scripts/specialize-patch: Process CONFIG_SCST_STRICT_SERIALIZING correctly ........ r7239 | bvassche | 2017-10-03 15:49:35 -0700 (Tue, 03 Oct 2017) | 1 line isert-scst: Make an error message more informative ........ r7240 | bvassche | 2017-10-03 16:08:29 -0700 (Tue, 03 Oct 2017) | 1 line scst: Port to kernel v4.13 ........ r7241 | bvassche | 2017-10-03 16:10:03 -0700 (Tue, 03 Oct 2017) | 1 line nightly build: Update kernel versions ........ r7242 | bvassche | 2017-10-05 09:57:27 -0700 (Thu, 05 Oct 2017) | 1 line scst: Port to openSUSE Leap 42.x ........ r7243 | bvassche | 2017-10-05 16:48:25 -0700 (Thu, 05 Oct 2017) | 1 line fcst: Port to openSUSE Leap ........ r7244 | bvassche | 2017-10-05 16:48:51 -0700 (Thu, 05 Oct 2017) | 1 line qla2x00t: Port to openSUSE Leap ........ git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7246 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
+2
-2
@@ -2498,9 +2498,9 @@ static bool srpt_is_target_enabled(struct scst_tgt *scst_tgt)
|
||||
/*
|
||||
* srpt_next_comp_vector() - Next completion vector >= sport->comp_vector
|
||||
*/
|
||||
static u8 srpt_next_comp_vector(struct srpt_port *sport)
|
||||
static u16 srpt_next_comp_vector(struct srpt_port *sport)
|
||||
{
|
||||
u8 comp_vector;
|
||||
u16 comp_vector;
|
||||
|
||||
mutex_lock(&sport->mutex);
|
||||
comp_vector = cpumask_next(sport->comp_vector, &sport->comp_v_mask);
|
||||
|
||||
+2
-2
@@ -379,7 +379,7 @@ struct srpt_rdma_ch {
|
||||
struct list_head cmd_wait_list;
|
||||
uint16_t pkey;
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) || defined(RHEL_RELEASE_CODE)
|
||||
u8 comp_vector;
|
||||
u16 comp_vector;
|
||||
#endif
|
||||
bool using_rdma_cm;
|
||||
bool processing_wait_list;
|
||||
@@ -433,7 +433,7 @@ struct srpt_port {
|
||||
struct list_head nexus_list;
|
||||
struct scst_tgt *scst_tgt;
|
||||
cpumask_t comp_v_mask;
|
||||
u8 comp_vector;
|
||||
u16 comp_vector;
|
||||
bool enabled;
|
||||
u8 port_id[64];
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user