Merge trunk r3632 properly

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.1.0.x@3861 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2011-09-17 16:20:48 +00:00
parent c57dc1b9f0
commit 2dc3be5a42

View File

@@ -3042,7 +3042,7 @@ static int srpt_perform_rdmas(struct srpt_rdma_ch *ch,
ioctx->ioctx.index);
msleep(1000);
}
while (atomic_read(&ch->state) != CH_DISCONNECTING &&
while (atomic_read(&ch->state) != CH_RELEASING &&
!ioctx->rdma_aborted) {
PRINT_INFO("Waiting until RDMA abort finished [%d]",
ioctx->ioctx.index);