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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2016-04-26 07:18:52 -07:00
parent 1068d7f453 76b20c76b8
commit 4b833bda28
5 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fcst/ft_sess.c
View File

@@ -172,25 +172,6 @@ static u32 ft_sess_hash(u32 port_id)
return hash_32(port_id, FT_SESS_HASH_BITS);
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) && \
! (LINUX_VERSION_CODE >> 8 == KERNEL_VERSION(3, 4, 0) >> 8 && \
LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 41)) && \
! (LINUX_VERSION_CODE >> 8 == KERNEL_VERSION(3, 2, 0) >> 8 && \
LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 44)) && \
!defined(CONFIG_SUSE_KERNEL) && \
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 6 || \
(RHEL_MAJOR -0 == 6 && RHEL_MINOR -0 < 6))
/*
* See also commit 4b20db3 (kref: Implement kref_get_unless_zero v3 -- v3.8).
* See also commit e3a5505 in branch stable/linux-3.4.y (v3.4.41).
* See also commit 3fa8ee5 in branch stable/linux-3.2.y (v3.2.44).
*/
static inline int __must_check kref_get_unless_zero(struct kref *kref)
{
return atomic_add_unless(&kref->refcount, 1, 0);
}
#endif
/*
* Find session in local port.
* Sessions and hash lists are RCU-protected.

31
iscsi-scst/kernel/isert-scst/iser_rdma.c
View File

@@ -42,6 +42,7 @@
#include "isert_dbg.h"
#include "iser.h"
#include "isert.h"
#include "iser_datamover.h"
#define ISER_CQ_ENTRIES (128 * 1024)
@@ -637,7 +638,7 @@ static void isert_handle_wc_error(struct ib_wc *wc)
#endif
if (unlikely(num_sge == 0)) /* Drain WR */
isert_sched_conn_drained(isert_conn);
else
else if (!isert_pdu->is_fake_rx)
isert_pdu_err(&isert_pdu->iscsi);
break;
case ISER_WR_RDMA_READ:
@@ -646,7 +647,8 @@ static void isert_handle_wc_error(struct ib_wc *wc)
isert_buf->dma_dir);
isert_buf->sg_cnt = 0;
}
isert_pdu_err(&isert_pdu->iscsi);
if (!isert_pdu->is_fake_rx)
isert_pdu_err(&isert_pdu->iscsi);
break;
case ISER_WR_RECV:
/* this should be the Flush, no task has been created yet */
@@ -1156,12 +1158,6 @@ fail_create_qp:
goto out;
}
static void isert_conn_qp_destroy(struct isert_connection *isert_conn)
{
rdma_destroy_qp(isert_conn->cm_id);
isert_conn->qp = NULL;
}
static struct isert_connection *isert_conn_create(struct rdma_cm_id *cm_id,
struct isert_device *isert_dev)
{
@@ -1238,7 +1234,7 @@ fail_post_recv:
mutex_lock(&dev_list_mutex);
isert_dev->cq_qps[cq->idx]--;
mutex_unlock(&dev_list_mutex);
isert_conn_qp_destroy(isert_conn);
rdma_destroy_qp(isert_conn->cm_id);
fail_qp:
isert_pdu_free(isert_conn->login_rsp_pdu);
fail_login_rsp_pdu:
@@ -1260,6 +1256,7 @@ static void isert_deref_device(struct isert_device *isert_dev)
static void isert_kref_free(struct kref *kref)
{
struct isert_conn_dev *dev;
struct isert_connection *isert_conn = container_of(kref,
struct isert_connection,
kref);
@@ -1272,7 +1269,14 @@ static void isert_kref_free(struct kref *kref)
isert_free_conn_resources(isert_conn);
isert_conn_qp_destroy(isert_conn);
rdma_destroy_id(isert_conn->cm_id);
dev = isert_get_priv(&isert_conn->iscsi);
if (dev)
isert_del_timer(dev);
ib_destroy_qp(isert_conn->qp);
isert_conn->qp = NULL;
mutex_lock(&dev_list_mutex);
isert_dev->cq_qps[cq->idx]--;
@@ -1282,8 +1286,6 @@ static void isert_kref_free(struct kref *kref)
isert_portal_free(isert_conn->portal);
mutex_unlock(&dev_list_mutex);
rdma_destroy_id(isert_conn->cm_id);
isert_conn_kfree(isert_conn);
module_put(THIS_MODULE);
@@ -1451,7 +1453,10 @@ static int isert_cm_connect_handler(struct rdma_cm_id *cm_id,
if (unlikely(ret))
goto out;
kref_get(&isert_conn->kref);
/* check if already started teardown */
if (!unlikely(kref_get_unless_zero(&isert_conn->kref)))
goto out;
/* notify upper layer */
ret = isert_conn_established(&isert_conn->iscsi,
(struct sockaddr *)&isert_conn->peer_addr,

1
iscsi-scst/kernel/isert-scst/isert.h
View File

@@ -131,5 +131,6 @@ int isert_conn_alloc(struct iscsi_session *session,
struct iscsit_transport *t);
int isert_handle_close_connection(struct iscsi_conn *conn);
void isert_close_all_portals(void);
void isert_del_timer(struct isert_conn_dev *dev);
#endif /* __ISERT_H__ */

2
iscsi-scst/kernel/isert-scst/isert_login.c
View File

@@ -83,7 +83,7 @@ static struct isert_conn_dev *get_available_dev(struct isert_listener_dev *dev,
return res;
}
static void isert_del_timer(struct isert_conn_dev *dev)
void isert_del_timer(struct isert_conn_dev *dev)
{
if (dev->timer_active) {
dev->timer_active = 0;

21
scst/include/backport.h
View File

@@ -327,6 +327,27 @@ enum umh_wait {
};
#endif
/* <linux/kref.h> */
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) && \
! (LINUX_VERSION_CODE >> 8 == KERNEL_VERSION(3, 4, 0) >> 8 && \
LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 41)) && \
! (LINUX_VERSION_CODE >> 8 == KERNEL_VERSION(3, 2, 0) >> 8 && \
LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 44)) && \
!defined(CONFIG_SUSE_KERNEL) && \
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 6 || \
(RHEL_MAJOR -0 == 6 && RHEL_MINOR -0 < 6))
/*
* See also commit 4b20db3 (kref: Implement kref_get_unless_zero v3 -- v3.8).
* See also commit e3a5505 in branch stable/linux-3.4.y (v3.4.41).
* See also commit 3fa8ee5 in branch stable/linux-3.2.y (v3.2.44).
*/
static inline int __must_check kref_get_unless_zero(struct kref *kref)
{
return atomic_add_unless(&kref->refcount, 1, 0);
}
#endif
/* <linux/list.h> */
#ifndef __list_for_each