Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3a86720567fd92819b449df10db85a2f73447d87

Authored by Andy Grover
Committed by Nicholas Bellinger
1 parent d0229ae3fe
Exists in master and in 38 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

target: Pass 2nd param of transport_split_cdb by value 

Since sectors is not modified, it's more straightforward to do this.

Signed-off-by: Andy Grover <agrover@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

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

drivers/target/target_core_scdb.c
Diff comments   View file @ 3a86720
... ... @@ -42,13 +42,13 @@
42 42 */
43 43 void split_cdb_XX_6(
44 44 unsigned long long lba,
45   - u32 *sectors,
  45 + u32 sectors,
46 46 unsigned char *cdb)
47 47 {
48 48 cdb[1] = (lba >> 16) & 0x1f;
49 49 cdb[2] = (lba >> 8) & 0xff;
50 50 cdb[3] = lba & 0xff;
51   - cdb[4] = *sectors & 0xff;
  51 + cdb[4] = sectors & 0xff;
52 52 }
53 53  
54 54 /* split_cdb_XX_10():
55 55  
... ... @@ -57,11 +57,11 @@
57 57 */
58 58 void split_cdb_XX_10(
59 59 unsigned long long lba,
60   - u32 *sectors,
  60 + u32 sectors,
61 61 unsigned char *cdb)
62 62 {
63 63 put_unaligned_be32(lba, &cdb[2]);
64   - put_unaligned_be16(*sectors, &cdb[7]);
  64 + put_unaligned_be16(sectors, &cdb[7]);
65 65 }
66 66  
67 67 /* split_cdb_XX_12():
68 68  
... ... @@ -70,11 +70,11 @@
70 70 */
71 71 void split_cdb_XX_12(
72 72 unsigned long long lba,
73   - u32 *sectors,
  73 + u32 sectors,
74 74 unsigned char *cdb)
75 75 {
76 76 put_unaligned_be32(lba, &cdb[2]);
77   - put_unaligned_be32(*sectors, &cdb[6]);
  77 + put_unaligned_be32(sectors, &cdb[6]);
78 78 }
79 79  
80 80 /* split_cdb_XX_16():
81 81  
... ... @@ -83,11 +83,11 @@
83 83 */
84 84 void split_cdb_XX_16(
85 85 unsigned long long lba,
86   - u32 *sectors,
  86 + u32 sectors,
87 87 unsigned char *cdb)
88 88 {
89 89 put_unaligned_be64(lba, &cdb[2]);
90   - put_unaligned_be32(*sectors, &cdb[10]);
  90 + put_unaligned_be32(sectors, &cdb[10]);
91 91 }
92 92  
93 93 /*
94 94  
... ... @@ -97,10 +97,10 @@
97 97 */
98 98 void split_cdb_XX_32(
99 99 unsigned long long lba,
100   - u32 *sectors,
  100 + u32 sectors,
101 101 unsigned char *cdb)
102 102 {
103 103 put_unaligned_be64(lba, &cdb[12]);
104   - put_unaligned_be32(*sectors, &cdb[28]);
  104 + put_unaligned_be32(sectors, &cdb[28]);
105 105 }
drivers/target/target_core_scdb.h
Diff comments   View file @ 3a86720
1 1 #ifndef TARGET_CORE_SCDB_H
2 2 #define TARGET_CORE_SCDB_H
3 3  
4   -extern void split_cdb_XX_6(unsigned long long, u32 *, unsigned char *);
5   -extern void split_cdb_XX_10(unsigned long long, u32 *, unsigned char *);
6   -extern void split_cdb_XX_12(unsigned long long, u32 *, unsigned char *);
7   -extern void split_cdb_XX_16(unsigned long long, u32 *, unsigned char *);
8   -extern void split_cdb_XX_32(unsigned long long, u32 *, unsigned char *);
  4 +extern void split_cdb_XX_6(unsigned long long, u32, unsigned char *);
  5 +extern void split_cdb_XX_10(unsigned long long, u32, unsigned char *);
  6 +extern void split_cdb_XX_12(unsigned long long, u32, unsigned char *);
  7 +extern void split_cdb_XX_16(unsigned long long, u32, unsigned char *);
  8 +extern void split_cdb_XX_32(unsigned long long, u32, unsigned char *);
9 9  
10 10 #endif /* TARGET_CORE_SCDB_H */
drivers/target/target_core_transport.c
Diff comments   View file @ 3a86720
... ... @@ -4728,8 +4728,7 @@
4728 4728 scsi_command_size(cmd->t_task_cdb));
4729 4729  
4730 4730 /* Update new cdb with updated lba/sectors */
4731   - cmd->transport_split_cdb(task->task_lba,
4732   - &task->task_sectors, cdb);
  4731 + cmd->transport_split_cdb(task->task_lba, task->task_sectors, cdb);
4733 4732  
4734 4733 /*
4735 4734 * Perform the SE OBJ plugin and/or Transport plugin specific
include/target/target_core_base.h
Diff comments   View file @ 3a86720
... ... @@ -479,7 +479,7 @@
479 479 struct list_head se_queue_node;
480 480 struct target_core_fabric_ops *se_tfo;
481 481 int (*transport_emulate_cdb)(struct se_cmd *);
482   - void (*transport_split_cdb)(unsigned long long, u32 *, unsigned char *);
  482 + void (*transport_split_cdb)(unsigned long long, u32, unsigned char *);
483 483 void (*transport_wait_for_tasks)(struct se_cmd *, int, int);
484 484 void (*transport_complete_callback)(struct se_cmd *);
485 485 int (*transport_qf_callback)(struct se_cmd *);