Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2017-04-11 21:14:11 -07:00

View File

@@ -3531,8 +3531,11 @@ static int srpt_xfer_data(struct srpt_rdma_ch *ch,
int ret;
if (ioctx->imm_data) {
BUG_ON(!srpt_test_and_set_cmd_state(ioctx, SRPT_STATE_NEED_DATA,
SRPT_STATE_DATA_IN));
bool res;
res = srpt_test_and_set_cmd_state(ioctx, SRPT_STATE_NEED_DATA,
SRPT_STATE_DATA_IN);
BUG_ON(!res);
if (unlikely(!scst_cmd_get_tgt_data_buff_alloced(cmd))) {
unsigned int offset = 0, len;
uint8_t *buf;