diff options
| author | Andy Grover <agrover@redhat.com> | 2011-06-08 10:36:43 -0700 |
|---|---|---|
| committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-07-22 09:37:48 +0000 |
| commit | 6708bb27bb2703da238f21f516034263348af5be (patch) | |
| tree | a23e1f9eab22933d773d6b6ad6263d6751379a00 /include/target | |
| parent | ec98f7825c6eaa4a9afb0eb518826efc8a2ed4a2 (diff) | |
target: Follow up core updates from AGrover and HCH (round 4)
This patch contains the squashed version of forth round series cleanups
from Andy and Christoph following the post heavy lifting in the preceeding:
'Eliminate usage of struct se_mem' and 'Make all control CDBs scatter-gather'
changes. This also includes a conversion of target core and the v3.0
mainline fabric modules (loopback and tcm_fc) to use pr_debug and the
CONFIG_DYNAMIC_DEBUG infrastructure!
These have been squashed into this third and final round for v3.1.
target: Remove ifdeffed code in t_g_process_write
target: Remove direct ramdisk code
target: Rename task_sg_num to task_sg_nents
target: Remove custom debug macros for pr_debug. Use pr_err().
target: Remove custom debug macros in mainline fabrics
target: Set WSNZ=1 in block limits VPD. Abort if WRITE_SAME sectors = 0
target: Remove transport do_se_mem_map callback
target: Further simplify transport_free_pages
target: Redo task allocation return value handling
target: Remove extra parentheses
target: change alloc_task call to take *cdb, not *cmd
(nab: Fix bogus struct file assignments in fd_do_readv and fd_do_writev)
Signed-off-by: Andy Grover <agrover@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'include/target')
| -rw-r--r-- | include/target/target_core_base.h | 2 | ||||
| -rw-r--r-- | include/target/target_core_transport.h | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h index 465f266a020..8204c76ca12 100644 --- a/include/target/target_core_base.h +++ b/include/target/target_core_base.h @@ -403,7 +403,7 @@ struct se_queue_obj { struct se_task { unsigned char task_sense; struct scatterlist *task_sg; - u32 task_sg_num; + u32 task_sg_nents; struct scatterlist *task_sg_bidi; u8 task_scsi_status; u8 task_flags; diff --git a/include/target/target_core_transport.h b/include/target/target_core_transport.h index 123df9238c6..740957655a6 100644 --- a/include/target/target_core_transport.h +++ b/include/target/target_core_transport.h @@ -292,7 +292,7 @@ struct se_subsystem_api { * drivers. Provided out of convenience. */ int (*transport_complete)(struct se_task *task); - struct se_task *(*alloc_task)(struct se_cmd *); + struct se_task *(*alloc_task)(unsigned char *cdb); /* * do_task(): */ @@ -342,11 +342,6 @@ struct se_subsystem_api { */ sector_t (*get_blocks)(struct se_device *); /* - * do_se_mem_map(): - */ - int (*do_se_mem_map)(struct se_task *, struct list_head *, void *, - struct se_mem *, struct se_mem **, u32 *, u32 *); - /* * get_sense_buffer(): */ unsigned char *(*get_sense_buffer)(struct se_task *); |