diff options
| author |   Andy Grover <agrover@redhat.com> | 2012-01-19 13:39:17 -0800 |
|---|---|---|
| committer |   Nicholas Bellinger <nab@linux-iscsi.org> | 2012-02-25 14:37:47 -0800 |
| commit | c8e31f26feeb03dc6f51bff68135cc58431e099b (patch) | |
| tree | 8d584fcb7cb7a58988cd2463a9a26f577410e6ac /drivers/infiniband/ulp/srpt/ib_srpt.c | |
| parent | tcm_fc: Remove cmd->cdb data member (diff) | |
| download | linux-dev-c8e31f26feeb03dc6f51bff68135cc58431e099b.tar.xz linux-dev-c8e31f26feeb03dc6f51bff68135cc58431e099b.zip | |
target: Add SCF_SCSI_TMR_CDB usage and drop se_tmr_req_cache
Change the test for if a cmd is a tmr request to checking if
SCF_SCSI_TMR_CDB (a new flag) is set in cmd->se_cmd_flags.
Also remove se_tmr_req_cache usage in favor of kzalloc usage,
and make core_tmr_alloc_req() return int + setup se_cmd->se_tmr_req
directly and fix up various fabric module usages
Cc: Andy Grover <agrover@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/infiniband/ulp/srpt/ib_srpt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c index e1e6b5b03c96..3290a57b248e 100644 --- a/drivers/infiniband/ulp/srpt/ib_srpt.c +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c @@ -1878,8 +1878,8 @@ static void srpt_handle_tsk_mgmt(struct srpt_rdma_ch *ch, TMR_TASK_MGMT_FUNCTION_NOT_SUPPORTED; goto process_tmr; } - cmd->se_tmr_req = core_tmr_alloc_req(cmd, NULL, tcm_tmr, GFP_KERNEL); - if (!cmd->se_tmr_req) { + res = core_tmr_alloc_req(cmd, NULL, tcm_tmr, GFP_KERNEL); + if (res < 0) { send_ioctx->cmd.se_cmd_flags |= SCF_SCSI_CDB_EXCEPTION; send_ioctx->cmd.se_tmr_req->response = TMR_FUNCTION_REJECTED; goto process_tmr; |