diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 16:01:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 16:01:14 -0700 |
| commit | 72f96e0e38d7e29ba16dcfd824ecaebe38b8293e (patch) | |
| tree | 2100f3333a993b529376add583985416f83002bf /drivers/target/target_core_pr.h | |
| parent | 17413f5acd03224bcd09eefc5c4088894e832cad (diff) | |
| parent | fa4951595648c14754621c99a07c47c9b9dcf05b (diff) | |
| download | linux-3.10-72f96e0e38d7e29ba16dcfd824ecaebe38b8293e.tar.gz linux-3.10-72f96e0e38d7e29ba16dcfd824ecaebe38b8293e.tar.bz2 linux-3.10-72f96e0e38d7e29ba16dcfd824ecaebe38b8293e.zip | |
Merge branch 'for-linus-core' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
* 'for-linus-core' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (38 commits)
target: Bump version to v4.1.0-rc1-ml
target: remove custom hex2bin() implementation
target: fix typo Assoication -> Association
target: Update QUEUE ALGORITHM MODIFIER control page default
target: ->map_task_SG conversion to ->map_control_SG and ->map_data_SG
target: Follow up core updates from AGrover and HCH (round 4)
target: Eliminate usage of struct se_mem
target: Pass 2nd param of transport_split_cdb by value
target: Enforce 1 page max for control cdb buffer sizes
target: Make all control CDBs scatter-gather
target: Implement Block Device Characteristics VPD page
target: Fix reporting of supported VPD pages
target: Allow for built-in target modules
tcm_fc: Convert to wake_up_process and schedule_timeout_interruptible
tcm_fc: Makefile cleanups
loopback: Fix memory leak in tcm_loop_make_scsi_hba()
loopback: Remove duplicate scsi/scsi_tcq.h include
loopback: off by one in tcm_loop_make_naa_tpg()
target/iblock: Remove unused iblock_dev members
target/iblock: Use request_queue->nr_request for se_device defaults
...
Diffstat (limited to 'drivers/target/target_core_pr.h')
| -rw-r--r-- | drivers/target/target_core_pr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/target/target_core_pr.h b/drivers/target/target_core_pr.h index 5603bcfd86d..c8f47d06458 100644 --- a/drivers/target/target_core_pr.h +++ b/drivers/target/target_core_pr.h @@ -49,7 +49,7 @@ extern int core_pr_dump_initiator_port(struct t10_pr_registration *, char *, u32); extern int core_scsi2_emulate_crh(struct se_cmd *); extern int core_scsi3_alloc_aptpl_registration( - struct t10_reservation_template *, u64, + struct t10_reservation *, u64, unsigned char *, unsigned char *, u32, unsigned char *, u16, u32, int, int, u8); extern int core_scsi3_check_aptpl_registration(struct se_device *, |