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
2017-09-20 19:08:10 -07:00
parent d6cbce92dd b39a0c64a2
commit 85bd690b33
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
srpt/src/ib_srpt.c
View File

@@ -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);

4
srpt/src/ib_srpt.h
View File

@@ -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];
};