diff options
| author | Clark Williams <williams@redhat.com> | 2012-03-01 09:15:01 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-03-01 09:15:01 -0600 |
| commit | 5ee07f2a498e0a5f4a9994317c0f2e451e27b4f2 (patch) | |
| tree | 8d8cc50a7de738e1e6b7a66ec27120f616b3919a /include/target | |
| parent | 5f269e50cb10cd1a74b89f7fda87b0c9082754f0 (diff) | |
| parent | 44fb3170ae46f8de964a4bb5b0504e865a6dd7da (diff) | |
Merge commit 'v3.2.9' into rt-3.2.9-rt13v3.2.9-rt13
Diffstat (limited to 'include/target')
| -rw-r--r-- | include/target/target_core_base.h | 1 | ||||
| -rw-r--r-- | include/target/target_core_transport.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h index a79886c86e91..94bbec38fd09 100644 --- a/include/target/target_core_base.h +++ b/include/target/target_core_base.h @@ -486,6 +486,7 @@ struct se_cmd { struct scatterlist *t_data_sg; unsigned int t_data_nents; + void *t_data_vmap; struct scatterlist *t_bidi_data_sg; unsigned int t_bidi_data_nents; diff --git a/include/target/target_core_transport.h b/include/target/target_core_transport.h index dac4f2d859fd..72751e85ea1a 100644 --- a/include/target/target_core_transport.h +++ b/include/target/target_core_transport.h @@ -129,8 +129,8 @@ extern void transport_init_se_cmd(struct se_cmd *, struct target_core_fabric_ops *, struct se_session *, u32, int, int, unsigned char *); -void *transport_kmap_first_data_page(struct se_cmd *cmd); -void transport_kunmap_first_data_page(struct se_cmd *cmd); +void *transport_kmap_data_sg(struct se_cmd *); +void transport_kunmap_data_sg(struct se_cmd *); extern int transport_generic_allocate_tasks(struct se_cmd *, unsigned char *); extern int transport_handle_cdb_direct(struct se_cmd *); extern int transport_generic_handle_cdb_map(struct se_cmd *); |