From 76a7f06e23110d24a9346bfaeb00ad33b2607bed Mon Sep 17 00:00:00 2001 From: Nicholas Bellinger Date: Tue, 27 Nov 2012 19:07:52 -0800 Subject: [PATCH] --- yaml --- r: 344758 b: refs/heads/master c: ffe0067544f93c0e71c793d7f17240486d091a3c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/target/target_core_iblock.c | 2 +- trunk/drivers/target/target_core_sbc.c | 2 +- trunk/include/target/target_core_backend.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 18ee1b18675e..c6eb64d351f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13f6a91479b06133eb99f1f43be02608eb867313 +refs/heads/master: ffe0067544f93c0e71c793d7f17240486d091a3c diff --git a/trunk/drivers/target/target_core_iblock.c b/trunk/drivers/target/target_core_iblock.c index 34f258b4d37f..b526d23dcd4f 100644 --- a/trunk/drivers/target/target_core_iblock.c +++ b/trunk/drivers/target/target_core_iblock.c @@ -481,7 +481,7 @@ iblock_execute_write_same(struct se_cmd *cmd) struct bio *bio; struct bio_list list; sector_t block_lba = cmd->t_task_lba; - unsigned int sectors = spc_get_write_same_sectors(cmd); + sector_t sectors = spc_get_write_same_sectors(cmd); sg = &cmd->t_data_sg[0]; diff --git a/trunk/drivers/target/target_core_sbc.c b/trunk/drivers/target/target_core_sbc.c index 94fd004ea3fc..26a6d183ccb1 100644 --- a/trunk/drivers/target/target_core_sbc.c +++ b/trunk/drivers/target/target_core_sbc.c @@ -107,7 +107,7 @@ sbc_emulate_readcapacity_16(struct se_cmd *cmd) return 0; } -int spc_get_write_same_sectors(struct se_cmd *cmd) +sector_t spc_get_write_same_sectors(struct se_cmd *cmd) { u32 num_blocks; diff --git a/trunk/include/target/target_core_backend.h b/trunk/include/target/target_core_backend.h index 3393ab10766c..507910992c59 100644 --- a/trunk/include/target/target_core_backend.h +++ b/trunk/include/target/target_core_backend.h @@ -52,7 +52,7 @@ void target_complete_cmd(struct se_cmd *, u8); sense_reason_t spc_parse_cdb(struct se_cmd *cmd, unsigned int *size); sense_reason_t spc_emulate_report_luns(struct se_cmd *cmd); -int spc_get_write_same_sectors(struct se_cmd *cmd); +sector_t spc_get_write_same_sectors(struct se_cmd *cmd); sense_reason_t sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops); u32 sbc_get_device_rev(struct se_device *dev);