Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 972b29c8f86093f44e1d781588bd5c5faae3d8e3

Authored by Roland Dreier
Committed by Nicholas Bellinger
1 parent 7b745c84a9
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

target: Rename spc_get_write_same_sectors -> sbc_get_write_same_sectors 

Trivial, but WRITE SAME is an SBC command so it seems strange for a
related function (defined in target_core_sbc.c) to be in the spc_
namespace.

Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

Showing 4 changed files with 7 additions and 7 deletions Side-by-side Diff

drivers/target/target_core_file.c
Diff comments   View file @ 972b29c
... ... @@ -381,7 +381,7 @@
381 381 struct scatterlist *sg;
382 382 struct iovec *iov;
383 383 mm_segment_t old_fs;
384   - sector_t nolb = spc_get_write_same_sectors(cmd);
  384 + sector_t nolb = sbc_get_write_same_sectors(cmd);
385 385 loff_t pos = cmd->t_task_lba * se_dev->dev_attrib.block_size;
386 386 unsigned int len, len_tmp, iov_num;
387 387 int i, rc;
drivers/target/target_core_iblock.c
Diff comments   View file @ 972b29c
... ... @@ -473,7 +473,7 @@
473 473 int rc;
474 474  
475 475 rc = blkdev_issue_discard(ib_dev->ibd_bd, cmd->t_task_lba,
476   - spc_get_write_same_sectors(cmd), GFP_KERNEL, 0);
  476 + sbc_get_write_same_sectors(cmd), GFP_KERNEL, 0);
477 477 if (rc < 0) {
478 478 pr_warn("blkdev_issue_discard() failed: %d\n", rc);
479 479 return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
... ... @@ -491,7 +491,7 @@
491 491 struct bio *bio;
492 492 struct bio_list list;
493 493 sector_t block_lba = cmd->t_task_lba;
494   - sector_t sectors = spc_get_write_same_sectors(cmd);
  494 + sector_t sectors = sbc_get_write_same_sectors(cmd);
495 495  
496 496 sg = &cmd->t_data_sg[0];
497 497  
drivers/target/target_core_sbc.c
Diff comments   View file @ 972b29c
... ... @@ -105,7 +105,7 @@
105 105 return 0;
106 106 }
107 107  
108   -sector_t spc_get_write_same_sectors(struct se_cmd *cmd)
  108 +sector_t sbc_get_write_same_sectors(struct se_cmd *cmd)
109 109 {
110 110 u32 num_blocks;
111 111  
... ... @@ -126,7 +126,7 @@
126 126 return cmd->se_dev->transport->get_blocks(cmd->se_dev) -
127 127 cmd->t_task_lba + 1;
128 128 }
129   -EXPORT_SYMBOL(spc_get_write_same_sectors);
  129 +EXPORT_SYMBOL(sbc_get_write_same_sectors);
130 130  
131 131 static sense_reason_t
132 132 sbc_emulate_noop(struct se_cmd *cmd)
... ... @@ -233,7 +233,7 @@
233 233 static sense_reason_t
234 234 sbc_setup_write_same(struct se_cmd *cmd, unsigned char *flags, struct sbc_ops *ops)
235 235 {
236   - unsigned int sectors = spc_get_write_same_sectors(cmd);
  236 + unsigned int sectors = sbc_get_write_same_sectors(cmd);
237 237  
238 238 if ((flags[0] & 0x04) || (flags[0] & 0x02)) {
239 239 pr_err("WRITE_SAME PBDATA and LBDATA"
include/target/target_core_backend.h
Diff comments   View file @ 972b29c
... ... @@ -53,13 +53,13 @@
53 53  
54 54 sense_reason_t spc_parse_cdb(struct se_cmd *cmd, unsigned int *size);
55 55 sense_reason_t spc_emulate_report_luns(struct se_cmd *cmd);
56   -sector_t spc_get_write_same_sectors(struct se_cmd *cmd);
57 56 sense_reason_t spc_emulate_inquiry_std(struct se_cmd *, unsigned char *);
58 57 sense_reason_t spc_emulate_evpd_83(struct se_cmd *, unsigned char *);
59 58  
60 59 sense_reason_t sbc_parse_cdb(struct se_cmd *cmd, struct sbc_ops *ops);
61 60 u32 sbc_get_device_rev(struct se_device *dev);
62 61 u32 sbc_get_device_type(struct se_device *dev);
  62 +sector_t sbc_get_write_same_sectors(struct se_cmd *cmd);
63 63  
64 64 void transport_set_vpd_proto_id(struct t10_vpd *, unsigned char *);
65 65 int transport_set_vpd_assoc(struct t10_vpd *, unsigned char *);