Merge branch 'svn-trunk' r6192

Conflicts:
	scst/include/scst.h
	scst/src/dev_handlers/scst_vdisk.c
This commit is contained in:
Bart Van Assche
2015-05-01 08:15:50 +02:00
16 changed files with 5788 additions and 246 deletions
+1 -1
View File
@@ -3434,7 +3434,7 @@ static int srpt_xfer_data(struct srpt_rdma_ch *ch,
len = scst_get_buf_next(cmd, &buf);
}
WARN_ON_ONCE(offset !=
scst_cmd_get_expected_transfer_len(cmd));
scst_cmd_get_expected_transfer_len_full(cmd));
}
scst_rx_data(cmd, SCST_RX_STATUS_SUCCESS,
in_irq() ? SCST_CONTEXT_TASKLET :