diff options
author | Hannes Reinecke <hare@suse.de> | 2013-11-19 03:07:46 -0500 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2013-11-20 14:24:40 -0500 |
commit | 125d0119d158180eb38580adfbc1a83d56120709 (patch) | |
tree | cfe240124c7844c10808483a12acf5f517090677 /drivers/target | |
parent | fcd40d69afea8700eda8cbf381f6d160cf757ebf (diff) |
target core: rename (ex,im)plict -> (ex,im)plicit
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target')
-rw-r--r-- | drivers/target/target_core_alua.c | 110 | ||||
-rw-r--r-- | drivers/target/target_core_alua.h | 20 | ||||
-rw-r--r-- | drivers/target/target_core_configfs.c | 26 | ||||
-rw-r--r-- | drivers/target/target_core_device.c | 6 | ||||
-rw-r--r-- | drivers/target/target_core_file.c | 2 | ||||
-rw-r--r-- | drivers/target/target_core_pr.c | 24 | ||||
-rw-r--r-- | drivers/target/target_core_spc.c | 6 | ||||
-rw-r--r-- | drivers/target/target_core_transport.c | 4 | ||||
-rw-r--r-- | drivers/target/target_core_ua.h | 2 |
9 files changed, 100 insertions, 100 deletions
diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c index 47244102281e..8297d3796d8c 100644 --- a/drivers/target/target_core_alua.c +++ b/drivers/target/target_core_alua.c | |||
@@ -44,7 +44,7 @@ | |||
44 | static sense_reason_t core_alua_check_transition(int state, int *primary); | 44 | static sense_reason_t core_alua_check_transition(int state, int *primary); |
45 | static int core_alua_set_tg_pt_secondary_state( | 45 | static int core_alua_set_tg_pt_secondary_state( |
46 | struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem, | 46 | struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem, |
47 | struct se_port *port, int explict, int offline); | 47 | struct se_port *port, int explicit, int offline); |
48 | 48 | ||
49 | static u16 alua_lu_gps_counter; | 49 | static u16 alua_lu_gps_counter; |
50 | static u32 alua_lu_gps_count; | 50 | static u32 alua_lu_gps_count; |
@@ -175,7 +175,7 @@ target_emulate_report_target_port_groups(struct se_cmd *cmd) | |||
175 | if (ext_hdr != 0) { | 175 | if (ext_hdr != 0) { |
176 | buf[4] = 0x10; | 176 | buf[4] = 0x10; |
177 | /* | 177 | /* |
178 | * Set the implict transition time (in seconds) for the application | 178 | * Set the implicit transition time (in seconds) for the application |
179 | * client to use as a base for it's transition timeout value. | 179 | * client to use as a base for it's transition timeout value. |
180 | * | 180 | * |
181 | * Use the current tg_pt_gp_mem -> tg_pt_gp membership from the LUN | 181 | * Use the current tg_pt_gp_mem -> tg_pt_gp membership from the LUN |
@@ -188,7 +188,7 @@ target_emulate_report_target_port_groups(struct se_cmd *cmd) | |||
188 | spin_lock(&tg_pt_gp_mem->tg_pt_gp_mem_lock); | 188 | spin_lock(&tg_pt_gp_mem->tg_pt_gp_mem_lock); |
189 | tg_pt_gp = tg_pt_gp_mem->tg_pt_gp; | 189 | tg_pt_gp = tg_pt_gp_mem->tg_pt_gp; |
190 | if (tg_pt_gp) | 190 | if (tg_pt_gp) |
191 | buf[5] = tg_pt_gp->tg_pt_gp_implict_trans_secs; | 191 | buf[5] = tg_pt_gp->tg_pt_gp_implicit_trans_secs; |
192 | spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock); | 192 | spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock); |
193 | } | 193 | } |
194 | } | 194 | } |
@@ -199,7 +199,7 @@ target_emulate_report_target_port_groups(struct se_cmd *cmd) | |||
199 | } | 199 | } |
200 | 200 | ||
201 | /* | 201 | /* |
202 | * SET_TARGET_PORT_GROUPS for explict ALUA operation. | 202 | * SET_TARGET_PORT_GROUPS for explicit ALUA operation. |
203 | * | 203 | * |
204 | * See spc4r17 section 6.35 | 204 | * See spc4r17 section 6.35 |
205 | */ | 205 | */ |
@@ -232,7 +232,7 @@ target_emulate_set_target_port_groups(struct se_cmd *cmd) | |||
232 | return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE; | 232 | return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE; |
233 | 233 | ||
234 | /* | 234 | /* |
235 | * Determine if explict ALUA via SET_TARGET_PORT_GROUPS is allowed | 235 | * Determine if explicit ALUA via SET_TARGET_PORT_GROUPS is allowed |
236 | * for the local tg_pt_gp. | 236 | * for the local tg_pt_gp. |
237 | */ | 237 | */ |
238 | l_tg_pt_gp_mem = l_port->sep_alua_tg_pt_gp_mem; | 238 | l_tg_pt_gp_mem = l_port->sep_alua_tg_pt_gp_mem; |
@@ -251,9 +251,9 @@ target_emulate_set_target_port_groups(struct se_cmd *cmd) | |||
251 | } | 251 | } |
252 | spin_unlock(&l_tg_pt_gp_mem->tg_pt_gp_mem_lock); | 252 | spin_unlock(&l_tg_pt_gp_mem->tg_pt_gp_mem_lock); |
253 | 253 | ||
254 | if (!(l_tg_pt_gp->tg_pt_gp_alua_access_type & TPGS_EXPLICT_ALUA)) { | 254 | if (!(l_tg_pt_gp->tg_pt_gp_alua_access_type & TPGS_EXPLICIT_ALUA)) { |
255 | pr_debug("Unable to process SET_TARGET_PORT_GROUPS" | 255 | pr_debug("Unable to process SET_TARGET_PORT_GROUPS" |
256 | " while TPGS_EXPLICT_ALUA is disabled\n"); | 256 | " while TPGS_EXPLICIT_ALUA is disabled\n"); |
257 | rc = TCM_UNSUPPORTED_SCSI_OPCODE; | 257 | rc = TCM_UNSUPPORTED_SCSI_OPCODE; |
258 | goto out; | 258 | goto out; |
259 | } | 259 | } |
@@ -620,7 +620,7 @@ out: | |||
620 | } | 620 | } |
621 | 621 | ||
622 | /* | 622 | /* |
623 | * Check implict and explict ALUA state change request. | 623 | * Check implicit and explicit ALUA state change request. |
624 | */ | 624 | */ |
625 | static sense_reason_t | 625 | static sense_reason_t |
626 | core_alua_check_transition(int state, int *primary) | 626 | core_alua_check_transition(int state, int *primary) |
@@ -676,10 +676,10 @@ char *core_alua_dump_status(int status) | |||
676 | switch (status) { | 676 | switch (status) { |
677 | case ALUA_STATUS_NONE: | 677 | case ALUA_STATUS_NONE: |
678 | return "None"; | 678 | return "None"; |
679 | case ALUA_STATUS_ALTERED_BY_EXPLICT_STPG: | 679 | case ALUA_STATUS_ALTERED_BY_EXPLICIT_STPG: |
680 | return "Altered by Explict STPG"; | 680 | return "Altered by Explicit STPG"; |
681 | case ALUA_STATUS_ALTERED_BY_IMPLICT_ALUA: | 681 | case ALUA_STATUS_ALTERED_BY_IMPLICIT_ALUA: |
682 | return "Altered by Implict ALUA"; | 682 | return "Altered by Implicit ALUA"; |
683 | default: | 683 | default: |
684 | return "Unknown"; | 684 | return "Unknown"; |
685 | } | 685 | } |
@@ -770,7 +770,7 @@ static int core_alua_do_transition_tg_pt( | |||
770 | struct se_node_acl *nacl, | 770 | struct se_node_acl *nacl, |
771 | unsigned char *md_buf, | 771 | unsigned char *md_buf, |
772 | int new_state, | 772 | int new_state, |
773 | int explict) | 773 | int explicit) |
774 | { | 774 | { |
775 | struct se_dev_entry *se_deve; | 775 | struct se_dev_entry *se_deve; |
776 | struct se_lun_acl *lacl; | 776 | struct se_lun_acl *lacl; |
@@ -784,9 +784,9 @@ static int core_alua_do_transition_tg_pt( | |||
784 | old_state = atomic_read(&tg_pt_gp->tg_pt_gp_alua_access_state); | 784 | old_state = atomic_read(&tg_pt_gp->tg_pt_gp_alua_access_state); |
785 | atomic_set(&tg_pt_gp->tg_pt_gp_alua_access_state, | 785 | atomic_set(&tg_pt_gp->tg_pt_gp_alua_access_state, |
786 | ALUA_ACCESS_STATE_TRANSITION); | 786 | ALUA_ACCESS_STATE_TRANSITION); |
787 | tg_pt_gp->tg_pt_gp_alua_access_status = (explict) ? | 787 | tg_pt_gp->tg_pt_gp_alua_access_status = (explicit) ? |
788 | ALUA_STATUS_ALTERED_BY_EXPLICT_STPG : | 788 | ALUA_STATUS_ALTERED_BY_EXPLICIT_STPG : |
789 | ALUA_STATUS_ALTERED_BY_IMPLICT_ALUA; | 789 | ALUA_STATUS_ALTERED_BY_IMPLICIT_ALUA; |
790 | /* | 790 | /* |
791 | * Check for the optional ALUA primary state transition delay | 791 | * Check for the optional ALUA primary state transition delay |
792 | */ | 792 | */ |
@@ -821,12 +821,12 @@ static int core_alua_do_transition_tg_pt( | |||
821 | lacl = se_deve->se_lun_acl; | 821 | lacl = se_deve->se_lun_acl; |
822 | /* | 822 | /* |
823 | * se_deve->se_lun_acl pointer may be NULL for a | 823 | * se_deve->se_lun_acl pointer may be NULL for a |
824 | * entry created without explict Node+MappedLUN ACLs | 824 | * entry created without explicit Node+MappedLUN ACLs |
825 | */ | 825 | */ |
826 | if (!lacl) | 826 | if (!lacl) |
827 | continue; | 827 | continue; |
828 | 828 | ||
829 | if (explict && | 829 | if (explicit && |
830 | (nacl != NULL) && (nacl == lacl->se_lun_nacl) && | 830 | (nacl != NULL) && (nacl == lacl->se_lun_nacl) && |
831 | (l_port != NULL) && (l_port == port)) | 831 | (l_port != NULL) && (l_port == port)) |
832 | continue; | 832 | continue; |
@@ -866,8 +866,8 @@ static int core_alua_do_transition_tg_pt( | |||
866 | atomic_set(&tg_pt_gp->tg_pt_gp_alua_access_state, new_state); | 866 | atomic_set(&tg_pt_gp->tg_pt_gp_alua_access_state, new_state); |
867 | 867 | ||
868 | pr_debug("Successful %s ALUA transition TG PT Group: %s ID: %hu" | 868 | pr_debug("Successful %s ALUA transition TG PT Group: %s ID: %hu" |
869 | " from primary access state %s to %s\n", (explict) ? "explict" : | 869 | " from primary access state %s to %s\n", (explicit) ? "explicit" : |
870 | "implict", config_item_name(&tg_pt_gp->tg_pt_gp_group.cg_item), | 870 | "implicit", config_item_name(&tg_pt_gp->tg_pt_gp_group.cg_item), |
871 | tg_pt_gp->tg_pt_gp_id, core_alua_dump_state(old_state), | 871 | tg_pt_gp->tg_pt_gp_id, core_alua_dump_state(old_state), |
872 | core_alua_dump_state(new_state)); | 872 | core_alua_dump_state(new_state)); |
873 | 873 | ||
@@ -880,7 +880,7 @@ int core_alua_do_port_transition( | |||
880 | struct se_port *l_port, | 880 | struct se_port *l_port, |
881 | struct se_node_acl *l_nacl, | 881 | struct se_node_acl *l_nacl, |
882 | int new_state, | 882 | int new_state, |
883 | int explict) | 883 | int explicit) |
884 | { | 884 | { |
885 | struct se_device *dev; | 885 | struct se_device *dev; |
886 | struct se_port *port; | 886 | struct se_port *port; |
@@ -917,7 +917,7 @@ int core_alua_do_port_transition( | |||
917 | * success. | 917 | * success. |
918 | */ | 918 | */ |
919 | core_alua_do_transition_tg_pt(l_tg_pt_gp, l_port, l_nacl, | 919 | core_alua_do_transition_tg_pt(l_tg_pt_gp, l_port, l_nacl, |
920 | md_buf, new_state, explict); | 920 | md_buf, new_state, explicit); |
921 | atomic_dec(&lu_gp->lu_gp_ref_cnt); | 921 | atomic_dec(&lu_gp->lu_gp_ref_cnt); |
922 | smp_mb__after_atomic_dec(); | 922 | smp_mb__after_atomic_dec(); |
923 | kfree(md_buf); | 923 | kfree(md_buf); |
@@ -970,7 +970,7 @@ int core_alua_do_port_transition( | |||
970 | * success. | 970 | * success. |
971 | */ | 971 | */ |
972 | core_alua_do_transition_tg_pt(tg_pt_gp, port, | 972 | core_alua_do_transition_tg_pt(tg_pt_gp, port, |
973 | nacl, md_buf, new_state, explict); | 973 | nacl, md_buf, new_state, explicit); |
974 | 974 | ||
975 | spin_lock(&dev->t10_alua.tg_pt_gps_lock); | 975 | spin_lock(&dev->t10_alua.tg_pt_gps_lock); |
976 | atomic_dec(&tg_pt_gp->tg_pt_gp_ref_cnt); | 976 | atomic_dec(&tg_pt_gp->tg_pt_gp_ref_cnt); |
@@ -987,7 +987,7 @@ int core_alua_do_port_transition( | |||
987 | pr_debug("Successfully processed LU Group: %s all ALUA TG PT" | 987 | pr_debug("Successfully processed LU Group: %s all ALUA TG PT" |
988 | " Group IDs: %hu %s transition to primary state: %s\n", | 988 | " Group IDs: %hu %s transition to primary state: %s\n", |
989 | config_item_name(&lu_gp->lu_gp_group.cg_item), | 989 | config_item_name(&lu_gp->lu_gp_group.cg_item), |
990 | l_tg_pt_gp->tg_pt_gp_id, (explict) ? "explict" : "implict", | 990 | l_tg_pt_gp->tg_pt_gp_id, (explicit) ? "explicit" : "implicit", |
991 | core_alua_dump_state(new_state)); | 991 | core_alua_dump_state(new_state)); |
992 | 992 | ||
993 | atomic_dec(&lu_gp->lu_gp_ref_cnt); | 993 | atomic_dec(&lu_gp->lu_gp_ref_cnt); |
@@ -1034,7 +1034,7 @@ static int core_alua_update_tpg_secondary_metadata( | |||
1034 | static int core_alua_set_tg_pt_secondary_state( | 1034 | static int core_alua_set_tg_pt_secondary_state( |
1035 | struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem, | 1035 | struct t10_alua_tg_pt_gp_member *tg_pt_gp_mem, |
1036 | struct se_port *port, | 1036 | struct se_port *port, |
1037 | int explict, | 1037 | int explicit, |
1038 | int offline) | 1038 | int offline) |
1039 | { | 1039 | { |
1040 | struct t10_alua_tg_pt_gp *tg_pt_gp; | 1040 | struct t10_alua_tg_pt_gp *tg_pt_gp; |
@@ -1061,13 +1061,13 @@ static int core_alua_set_tg_pt_secondary_state( | |||
1061 | atomic_set(&port->sep_tg_pt_secondary_offline, 0); | 1061 | atomic_set(&port->sep_tg_pt_secondary_offline, 0); |
1062 | 1062 | ||
1063 | md_buf_len = tg_pt_gp->tg_pt_gp_md_buf_len; | 1063 | md_buf_len = tg_pt_gp->tg_pt_gp_md_buf_len; |
1064 | port->sep_tg_pt_secondary_stat = (explict) ? | 1064 | port->sep_tg_pt_secondary_stat = (explicit) ? |
1065 | ALUA_STATUS_ALTERED_BY_EXPLICT_STPG : | 1065 | ALUA_STATUS_ALTERED_BY_EXPLICIT_STPG : |
1066 | ALUA_STATUS_ALTERED_BY_IMPLICT_ALUA; | 1066 | ALUA_STATUS_ALTERED_BY_IMPLICIT_ALUA; |
1067 | 1067 | ||
1068 | pr_debug("Successful %s ALUA transition TG PT Group: %s ID: %hu" | 1068 | pr_debug("Successful %s ALUA transition TG PT Group: %s ID: %hu" |
1069 | " to secondary access state: %s\n", (explict) ? "explict" : | 1069 | " to secondary access state: %s\n", (explicit) ? "explicit" : |
1070 | "implict", config_item_name(&tg_pt_gp->tg_pt_gp_group.cg_item), | 1070 | "implicit", config_item_name(&tg_pt_gp->tg_pt_gp_group.cg_item), |
1071 | tg_pt_gp->tg_pt_gp_id, (offline) ? "OFFLINE" : "ONLINE"); | 1071 | tg_pt_gp->tg_pt_gp_id, (offline) ? "OFFLINE" : "ONLINE"); |
1072 | 1072 | ||
1073 | spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock); | 1073 | spin_unlock(&tg_pt_gp_mem->tg_pt_gp_mem_lock); |
@@ -1356,16 +1356,16 @@ struct t10_alua_tg_pt_gp *core_alua_allocate_tg_pt_gp(struct se_device *dev, | |||
1356 | atomic_set(&tg_pt_gp->tg_pt_gp_alua_access_state, | 1356 | atomic_set(&tg_pt_gp->tg_pt_gp_alua_access_state, |
1357 | ALUA_ACCESS_STATE_ACTIVE_OPTMIZED); | 1357 | ALUA_ACCESS_STATE_ACTIVE_OPTMIZED); |
1358 | /* | 1358 | /* |
1359 | * Enable both explict and implict ALUA support by default | 1359 | * Enable both explicit and implicit ALUA support by default |
1360 | */ | 1360 | */ |
1361 | tg_pt_gp->tg_pt_gp_alua_access_type = | 1361 | tg_pt_gp->tg_pt_gp_alua_access_type = |
1362 | TPGS_EXPLICT_ALUA | TPGS_IMPLICT_ALUA; | 1362 | TPGS_EXPLICIT_ALUA | TPGS_IMPLICIT_ALUA; |
1363 | /* | 1363 | /* |
1364 | * Set the default Active/NonOptimized Delay in milliseconds | 1364 | * Set the default Active/NonOptimized Delay in milliseconds |
1365 | */ | 1365 | */ |
1366 | tg_pt_gp->tg_pt_gp_nonop_delay_msecs = ALUA_DEFAULT_NONOP_DELAY_MSECS; | 1366 | tg_pt_gp->tg_pt_gp_nonop_delay_msecs = ALUA_DEFAULT_NONOP_DELAY_MSECS; |
1367 | tg_pt_gp->tg_pt_gp_trans_delay_msecs = ALUA_DEFAULT_TRANS_DELAY_MSECS; | 1367 | tg_pt_gp->tg_pt_gp_trans_delay_msecs = ALUA_DEFAULT_TRANS_DELAY_MSECS; |
1368 | tg_pt_gp->tg_pt_gp_implict_trans_secs = ALUA_DEFAULT_IMPLICT_TRANS_SECS; | 1368 | tg_pt_gp->tg_pt_gp_implicit_trans_secs = ALUA_DEFAULT_IMPLICIT_TRANS_SECS; |
1369 | 1369 | ||
1370 | if (def_group) { | 1370 | if (def_group) { |
1371 | spin_lock(&dev->t10_alua.tg_pt_gps_lock); | 1371 | spin_lock(&dev->t10_alua.tg_pt_gps_lock); |
@@ -1465,7 +1465,7 @@ void core_alua_free_tg_pt_gp( | |||
1465 | * been called from target_core_alua_drop_tg_pt_gp(). | 1465 | * been called from target_core_alua_drop_tg_pt_gp(). |
1466 | * | 1466 | * |
1467 | * Here we remove *tg_pt_gp from the global list so that | 1467 | * Here we remove *tg_pt_gp from the global list so that |
1468 | * no assications *OR* explict ALUA via SET_TARGET_PORT_GROUPS | 1468 | * no assications *OR* explicit ALUA via SET_TARGET_PORT_GROUPS |
1469 | * can be made while we are releasing struct t10_alua_tg_pt_gp. | 1469 | * can be made while we are releasing struct t10_alua_tg_pt_gp. |
1470 | */ | 1470 | */ |
1471 | spin_lock(&dev->t10_alua.tg_pt_gps_lock); | 1471 | spin_lock(&dev->t10_alua.tg_pt_gps_lock); |
@@ -1740,13 +1740,13 @@ ssize_t core_alua_show_access_type( | |||
1740 | struct t10_alua_tg_pt_gp *tg_pt_gp, | 1740 | struct t10_alua_tg_pt_gp *tg_pt_gp, |
1741 | char *page) | 1741 | char *page) |
1742 | { | 1742 | { |
1743 | if ((tg_pt_gp->tg_pt_gp_alua_access_type & TPGS_EXPLICT_ALUA) && | 1743 | if ((tg_pt_gp->tg_pt_gp_alua_access_type & TPGS_EXPLICIT_ALUA) && |
1744 | (tg_pt_gp->tg_pt_gp_alua_access_type & TPGS_IMPLICT_ALUA)) | 1744 | (tg_pt_gp->tg_pt_gp_alua_access_type & TPGS_IMPLICIT_ALUA)) |
1745 | return sprintf(page, "Implict and Explict\n"); | 1745 | return sprintf(page, "Implicit and Explicit\n"); |
1746 | else if (tg_pt_gp->tg_pt_gp_alua_access_type & TPGS_IMPLICT_ALUA) | 1746 | else if (tg_pt_gp->tg_pt_gp_alua_access_type & TPGS_IMPLICIT_ALUA) |
1747 | return sprintf(page, "Implict\n"); | 1747 | return sprintf(page, "Implicit\n"); |
1748 | else if (tg_pt_gp->tg_pt_gp_alua_access_type & TPGS_EXPLICT_ALUA) | 1748 | else if (tg_pt_gp->tg_pt_gp_alua_access_type & TPGS_EXPLICIT_ALUA) |
1749 | return sprintf(page, "Explict\n"); | 1749 | return sprintf(page, "Explicit\n"); |
1750 | else | 1750 | else |
1751 | return sprintf(page, "None\n"); | 1751 | return sprintf(page, "None\n"); |
1752 | } | 1752 | } |
@@ -1771,11 +1771,11 @@ ssize_t core_alua_store_access_type( | |||
1771 | } | 1771 | } |
1772 | if (tmp == 3) | 1772 | if (tmp == 3) |
1773 | tg_pt_gp->tg_pt_gp_alua_access_type = | 1773 | tg_pt_gp->tg_pt_gp_alua_access_type = |
1774 | TPGS_IMPLICT_ALUA | TPGS_EXPLICT_ALUA; | 1774 | TPGS_IMPLICIT_ALUA | TPGS_EXPLICIT_ALUA; |
1775 | else if (tmp == 2) | 1775 | else if (tmp == 2) |
1776 | tg_pt_gp->tg_pt_gp_alua_access_type = TPGS_EXPLICT_ALUA; | 1776 | tg_pt_gp->tg_pt_gp_alua_access_type = TPGS_EXPLICIT_ALUA; |
1777 | else if (tmp == 1) | 1777 | else if (tmp == 1) |
1778 | tg_pt_gp->tg_pt_gp_alua_access_type = TPGS_IMPLICT_ALUA; | 1778 | tg_pt_gp->tg_pt_gp_alua_access_type = TPGS_IMPLICIT_ALUA; |
1779 | else | 1779 | else |
1780 | tg_pt_gp->tg_pt_gp_alua_access_type = 0; | 1780 | tg_pt_gp->tg_pt_gp_alua_access_type = 0; |
1781 | 1781 | ||
@@ -1844,14 +1844,14 @@ ssize_t core_alua_store_trans_delay_msecs( | |||
1844 | return count; | 1844 | return count; |
1845 | } | 1845 | } |
1846 | 1846 | ||
1847 | ssize_t core_alua_show_implict_trans_secs( | 1847 | ssize_t core_alua_show_implicit_trans_secs( |
1848 | struct t10_alua_tg_pt_gp *tg_pt_gp, | 1848 | struct t10_alua_tg_pt_gp *tg_pt_gp, |
1849 | char *page) | 1849 | char *page) |
1850 | { | 1850 | { |
1851 | return sprintf(page, "%d\n", tg_pt_gp->tg_pt_gp_implict_trans_secs); | 1851 | return sprintf(page, "%d\n", tg_pt_gp->tg_pt_gp_implicit_trans_secs); |
1852 | } | 1852 | } |
1853 | 1853 | ||
1854 | ssize_t core_alua_store_implict_trans_secs( | 1854 | ssize_t core_alua_store_implicit_trans_secs( |
1855 | struct t10_alua_tg_pt_gp *tg_pt_gp, | 1855 | struct t10_alua_tg_pt_gp *tg_pt_gp, |
1856 | const char *page, | 1856 | const char *page, |
1857 | size_t count) | 1857 | size_t count) |
@@ -1861,16 +1861,16 @@ ssize_t core_alua_store_implict_trans_secs( | |||
1861 | 1861 | ||
1862 | ret = kstrtoul(page, 0, &tmp); | 1862 | ret = kstrtoul(page, 0, &tmp); |
1863 | if (ret < 0) { | 1863 | if (ret < 0) { |
1864 | pr_err("Unable to extract implict_trans_secs\n"); | 1864 | pr_err("Unable to extract implicit_trans_secs\n"); |
1865 | return ret; | 1865 | return ret; |
1866 | } | 1866 | } |
1867 | if (tmp > ALUA_MAX_IMPLICT_TRANS_SECS) { | 1867 | if (tmp > ALUA_MAX_IMPLICIT_TRANS_SECS) { |
1868 | pr_err("Passed implict_trans_secs: %lu, exceeds" | 1868 | pr_err("Passed implicit_trans_secs: %lu, exceeds" |
1869 | " ALUA_MAX_IMPLICT_TRANS_SECS: %d\n", tmp, | 1869 | " ALUA_MAX_IMPLICIT_TRANS_SECS: %d\n", tmp, |
1870 | ALUA_MAX_IMPLICT_TRANS_SECS); | 1870 | ALUA_MAX_IMPLICIT_TRANS_SECS); |
1871 | return -EINVAL; | 1871 | return -EINVAL; |
1872 | } | 1872 | } |
1873 | tg_pt_gp->tg_pt_gp_implict_trans_secs = (int)tmp; | 1873 | tg_pt_gp->tg_pt_gp_implicit_trans_secs = (int)tmp; |
1874 | 1874 | ||
1875 | return count; | 1875 | return count; |
1876 | } | 1876 | } |
@@ -1970,8 +1970,8 @@ ssize_t core_alua_store_secondary_status( | |||
1970 | return ret; | 1970 | return ret; |
1971 | } | 1971 | } |
1972 | if ((tmp != ALUA_STATUS_NONE) && | 1972 | if ((tmp != ALUA_STATUS_NONE) && |
1973 | (tmp != ALUA_STATUS_ALTERED_BY_EXPLICT_STPG) && | 1973 | (tmp != ALUA_STATUS_ALTERED_BY_EXPLICIT_STPG) && |
1974 | (tmp != ALUA_STATUS_ALTERED_BY_IMPLICT_ALUA)) { | 1974 | (tmp != ALUA_STATUS_ALTERED_BY_IMPLICIT_ALUA)) { |
1975 | pr_err("Illegal value for alua_tg_pt_status: %lu\n", | 1975 | pr_err("Illegal value for alua_tg_pt_status: %lu\n", |
1976 | tmp); | 1976 | tmp); |
1977 | return -EINVAL; | 1977 | return -EINVAL; |
diff --git a/drivers/target/target_core_alua.h b/drivers/target/target_core_alua.h index e539c3e7f4ad..74cf0c0581e6 100644 --- a/drivers/target/target_core_alua.h +++ b/drivers/target/target_core_alua.h | |||
@@ -7,8 +7,8 @@ | |||
7 | * from spc4r17 section 6.4.2 Table 135 | 7 | * from spc4r17 section 6.4.2 Table 135 |
8 | */ | 8 | */ |
9 | #define TPGS_NO_ALUA 0x00 | 9 | #define TPGS_NO_ALUA 0x00 |
10 | #define TPGS_IMPLICT_ALUA 0x10 | 10 | #define TPGS_IMPLICIT_ALUA 0x10 |
11 | #define TPGS_EXPLICT_ALUA 0x20 | 11 | #define TPGS_EXPLICIT_ALUA 0x20 |
12 | 12 | ||
13 | /* | 13 | /* |
14 | * ASYMMETRIC ACCESS STATE field | 14 | * ASYMMETRIC ACCESS STATE field |
@@ -28,8 +28,8 @@ | |||
28 | * from spc4r17 section 6.27 Table 246 | 28 | * from spc4r17 section 6.27 Table 246 |
29 | */ | 29 | */ |
30 | #define ALUA_STATUS_NONE 0x00 | 30 | #define ALUA_STATUS_NONE 0x00 |
31 | #define ALUA_STATUS_ALTERED_BY_EXPLICT_STPG 0x01 | 31 | #define ALUA_STATUS_ALTERED_BY_EXPLICIT_STPG 0x01 |
32 | #define ALUA_STATUS_ALTERED_BY_IMPLICT_ALUA 0x02 | 32 | #define ALUA_STATUS_ALTERED_BY_IMPLICIT_ALUA 0x02 |
33 | 33 | ||
34 | /* | 34 | /* |
35 | * From spc4r17, Table D.1: ASC and ASCQ Assignement | 35 | * From spc4r17, Table D.1: ASC and ASCQ Assignement |
@@ -46,17 +46,17 @@ | |||
46 | #define ALUA_DEFAULT_NONOP_DELAY_MSECS 100 | 46 | #define ALUA_DEFAULT_NONOP_DELAY_MSECS 100 |
47 | #define ALUA_MAX_NONOP_DELAY_MSECS 10000 /* 10 seconds */ | 47 | #define ALUA_MAX_NONOP_DELAY_MSECS 10000 /* 10 seconds */ |
48 | /* | 48 | /* |
49 | * Used for implict and explict ALUA transitional delay, that is disabled | 49 | * Used for implicit and explicit ALUA transitional delay, that is disabled |
50 | * by default, and is intended to be used for debugging client side ALUA code. | 50 | * by default, and is intended to be used for debugging client side ALUA code. |
51 | */ | 51 | */ |
52 | #define ALUA_DEFAULT_TRANS_DELAY_MSECS 0 | 52 | #define ALUA_DEFAULT_TRANS_DELAY_MSECS 0 |
53 | #define ALUA_MAX_TRANS_DELAY_MSECS 30000 /* 30 seconds */ | 53 | #define ALUA_MAX_TRANS_DELAY_MSECS 30000 /* 30 seconds */ |
54 | /* | 54 | /* |
55 | * Used for the recommended application client implict transition timeout | 55 | * Used for the recommended application client implicit transition timeout |
56 | * in seconds, returned by the REPORT_TARGET_PORT_GROUPS w/ extended header. | 56 | * in seconds, returned by the REPORT_TARGET_PORT_GROUPS w/ extended header. |
57 | */ | 57 | */ |
58 | #define ALUA_DEFAULT_IMPLICT_TRANS_SECS 0 | 58 | #define ALUA_DEFAULT_IMPLICIT_TRANS_SECS 0 |
59 | #define ALUA_MAX_IMPLICT_TRANS_SECS 255 | 59 | #define ALUA_MAX_IMPLICIT_TRANS_SECS 255 |
60 | /* | 60 | /* |
61 | * Used by core_alua_update_tpg_primary_metadata() and | 61 | * Used by core_alua_update_tpg_primary_metadata() and |
62 | * core_alua_update_tpg_secondary_metadata() | 62 | * core_alua_update_tpg_secondary_metadata() |
@@ -113,9 +113,9 @@ extern ssize_t core_alua_show_trans_delay_msecs(struct t10_alua_tg_pt_gp *, | |||
113 | char *); | 113 | char *); |
114 | extern ssize_t core_alua_store_trans_delay_msecs(struct t10_alua_tg_pt_gp *, | 114 | extern ssize_t core_alua_store_trans_delay_msecs(struct t10_alua_tg_pt_gp *, |
115 | const char *, size_t); | 115 | const char *, size_t); |
116 | extern ssize_t core_alua_show_implict_trans_secs(struct t10_alua_tg_pt_gp *, | 116 | extern ssize_t core_alua_show_implicit_trans_secs(struct t10_alua_tg_pt_gp *, |
117 | char *); | 117 | char *); |
118 | extern ssize_t core_alua_store_implict_trans_secs(struct t10_alua_tg_pt_gp *, | 118 | extern ssize_t core_alua_store_implicit_trans_secs(struct t10_alua_tg_pt_gp *, |
119 | const char *, size_t); | 119 | const char *, size_t); |
120 | extern ssize_t core_alua_show_preferred_bit(struct t10_alua_tg_pt_gp *, | 120 | extern ssize_t core_alua_show_preferred_bit(struct t10_alua_tg_pt_gp *, |
121 | char *); | 121 | char *); |
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c index b04edc12f9d5..3a964fbf50ee 100644 --- a/drivers/target/target_core_configfs.c +++ b/drivers/target/target_core_configfs.c | |||
@@ -2036,7 +2036,7 @@ static ssize_t target_core_alua_tg_pt_gp_store_attr_alua_access_state( | |||
2036 | int new_state, ret; | 2036 | int new_state, ret; |
2037 | 2037 | ||
2038 | if (!tg_pt_gp->tg_pt_gp_valid_id) { | 2038 | if (!tg_pt_gp->tg_pt_gp_valid_id) { |
2039 | pr_err("Unable to do implict ALUA on non valid" | 2039 | pr_err("Unable to do implicit ALUA on non valid" |
2040 | " tg_pt_gp ID: %hu\n", tg_pt_gp->tg_pt_gp_valid_id); | 2040 | " tg_pt_gp ID: %hu\n", tg_pt_gp->tg_pt_gp_valid_id); |
2041 | return -EINVAL; | 2041 | return -EINVAL; |
2042 | } | 2042 | } |
@@ -2049,9 +2049,9 @@ static ssize_t target_core_alua_tg_pt_gp_store_attr_alua_access_state( | |||
2049 | } | 2049 | } |
2050 | new_state = (int)tmp; | 2050 | new_state = (int)tmp; |
2051 | 2051 | ||
2052 | if (!(tg_pt_gp->tg_pt_gp_alua_access_type & TPGS_IMPLICT_ALUA)) { | 2052 | if (!(tg_pt_gp->tg_pt_gp_alua_access_type & TPGS_IMPLICIT_ALUA)) { |
2053 | pr_err("Unable to process implict configfs ALUA" | 2053 | pr_err("Unable to process implicit configfs ALUA" |
2054 | " transition while TPGS_IMPLICT_ALUA is disabled\n"); | 2054 | " transition while TPGS_IMPLICIT_ALUA is disabled\n"); |
2055 | return -EINVAL; | 2055 | return -EINVAL; |
2056 | } | 2056 | } |
2057 | 2057 | ||
@@ -2097,8 +2097,8 @@ static ssize_t target_core_alua_tg_pt_gp_store_attr_alua_access_status( | |||
2097 | new_status = (int)tmp; | 2097 | new_status = (int)tmp; |
2098 | 2098 | ||
2099 | if ((new_status != ALUA_STATUS_NONE) && | 2099 | if ((new_status != ALUA_STATUS_NONE) && |
2100 | (new_status != ALUA_STATUS_ALTERED_BY_EXPLICT_STPG) && | 2100 | (new_status != ALUA_STATUS_ALTERED_BY_EXPLICIT_STPG) && |
2101 | (new_status != ALUA_STATUS_ALTERED_BY_IMPLICT_ALUA)) { | 2101 | (new_status != ALUA_STATUS_ALTERED_BY_IMPLICIT_ALUA)) { |
2102 | pr_err("Illegal ALUA access status: 0x%02x\n", | 2102 | pr_err("Illegal ALUA access status: 0x%02x\n", |
2103 | new_status); | 2103 | new_status); |
2104 | return -EINVAL; | 2104 | return -EINVAL; |
@@ -2210,24 +2210,24 @@ static ssize_t target_core_alua_tg_pt_gp_store_attr_trans_delay_msecs( | |||
2210 | SE_DEV_ALUA_TG_PT_ATTR(trans_delay_msecs, S_IRUGO | S_IWUSR); | 2210 | SE_DEV_ALUA_TG_PT_ATTR(trans_delay_msecs, S_IRUGO | S_IWUSR); |
2211 | 2211 | ||
2212 | /* | 2212 | /* |
2213 | * implict_trans_secs | 2213 | * implicit_trans_secs |
2214 | */ | 2214 | */ |
2215 | static ssize_t target_core_alua_tg_pt_gp_show_attr_implict_trans_secs( | 2215 | static ssize_t target_core_alua_tg_pt_gp_show_attr_implicit_trans_secs( |
2216 | struct t10_alua_tg_pt_gp *tg_pt_gp, | 2216 | struct t10_alua_tg_pt_gp *tg_pt_gp, |
2217 | char *page) | 2217 | char *page) |
2218 | { | 2218 | { |
2219 | return core_alua_show_implict_trans_secs(tg_pt_gp, page); | 2219 | return core_alua_show_implicit_trans_secs(tg_pt_gp, page); |
2220 | } | 2220 | } |
2221 | 2221 | ||
2222 | static ssize_t target_core_alua_tg_pt_gp_store_attr_implict_trans_secs( | 2222 | static ssize_t target_core_alua_tg_pt_gp_store_attr_implicit_trans_secs( |
2223 | struct t10_alua_tg_pt_gp *tg_pt_gp, | 2223 | struct t10_alua_tg_pt_gp *tg_pt_gp, |
2224 | const char *page, | 2224 | const char *page, |
2225 | size_t count) | 2225 | size_t count) |
2226 | { | 2226 | { |
2227 | return core_alua_store_implict_trans_secs(tg_pt_gp, page, count); | 2227 | return core_alua_store_implicit_trans_secs(tg_pt_gp, page, count); |
2228 | } | 2228 | } |
2229 | 2229 | ||
2230 | SE_DEV_ALUA_TG_PT_ATTR(implict_trans_secs, S_IRUGO | S_IWUSR); | 2230 | SE_DEV_ALUA_TG_PT_ATTR(implicit_trans_secs, S_IRUGO | S_IWUSR); |
2231 | 2231 | ||
2232 | /* | 2232 | /* |
2233 | * preferred | 2233 | * preferred |
@@ -2353,7 +2353,7 @@ static struct configfs_attribute *target_core_alua_tg_pt_gp_attrs[] = { | |||
2353 | &target_core_alua_tg_pt_gp_alua_write_metadata.attr, | 2353 | &target_core_alua_tg_pt_gp_alua_write_metadata.attr, |
2354 | &target_core_alua_tg_pt_gp_nonop_delay_msecs.attr, | 2354 | &target_core_alua_tg_pt_gp_nonop_delay_msecs.attr, |
2355 | &target_core_alua_tg_pt_gp_trans_delay_msecs.attr, | 2355 | &target_core_alua_tg_pt_gp_trans_delay_msecs.attr, |
2356 | &target_core_alua_tg_pt_gp_implict_trans_secs.attr, | 2356 | &target_core_alua_tg_pt_gp_implicit_trans_secs.attr, |
2357 | &target_core_alua_tg_pt_gp_preferred.attr, | 2357 | &target_core_alua_tg_pt_gp_preferred.attr, |
2358 | &target_core_alua_tg_pt_gp_tg_pt_gp_id.attr, | 2358 | &target_core_alua_tg_pt_gp_tg_pt_gp_id.attr, |
2359 | &target_core_alua_tg_pt_gp_members.attr, | 2359 | &target_core_alua_tg_pt_gp_members.attr, |
diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c index 986afd2ee3f6..207b340498a3 100644 --- a/drivers/target/target_core_device.c +++ b/drivers/target/target_core_device.c | |||
@@ -313,14 +313,14 @@ int core_enable_device_list_for_node( | |||
313 | deve = nacl->device_list[mapped_lun]; | 313 | deve = nacl->device_list[mapped_lun]; |
314 | 314 | ||
315 | /* | 315 | /* |
316 | * Check if the call is handling demo mode -> explict LUN ACL | 316 | * Check if the call is handling demo mode -> explicit LUN ACL |
317 | * transition. This transition must be for the same struct se_lun | 317 | * transition. This transition must be for the same struct se_lun |
318 | * + mapped_lun that was setup in demo mode.. | 318 | * + mapped_lun that was setup in demo mode.. |
319 | */ | 319 | */ |
320 | if (deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS) { | 320 | if (deve->lun_flags & TRANSPORT_LUNFLAGS_INITIATOR_ACCESS) { |
321 | if (deve->se_lun_acl != NULL) { | 321 | if (deve->se_lun_acl != NULL) { |
322 | pr_err("struct se_dev_entry->se_lun_acl" | 322 | pr_err("struct se_dev_entry->se_lun_acl" |
323 | " already set for demo mode -> explict" | 323 | " already set for demo mode -> explicit" |
324 | " LUN ACL transition\n"); | 324 | " LUN ACL transition\n"); |
325 | spin_unlock_irq(&nacl->device_list_lock); | 325 | spin_unlock_irq(&nacl->device_list_lock); |
326 | return -EINVAL; | 326 | return -EINVAL; |
@@ -328,7 +328,7 @@ int core_enable_device_list_for_node( | |||
328 | if (deve->se_lun != lun) { | 328 | if (deve->se_lun != lun) { |
329 | pr_err("struct se_dev_entry->se_lun does" | 329 | pr_err("struct se_dev_entry->se_lun does" |
330 | " match passed struct se_lun for demo mode" | 330 | " match passed struct se_lun for demo mode" |
331 | " -> explict LUN ACL transition\n"); | 331 | " -> explicit LUN ACL transition\n"); |
332 | spin_unlock_irq(&nacl->device_list_lock); | 332 | spin_unlock_irq(&nacl->device_list_lock); |
333 | return -EINVAL; | 333 | return -EINVAL; |
334 | } | 334 | } |
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c index b662f89dedac..0e34cda3271e 100644 --- a/drivers/target/target_core_file.c +++ b/drivers/target/target_core_file.c | |||
@@ -562,7 +562,7 @@ fd_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents, | |||
562 | } else { | 562 | } else { |
563 | ret = fd_do_rw(cmd, sgl, sgl_nents, 1); | 563 | ret = fd_do_rw(cmd, sgl, sgl_nents, 1); |
564 | /* | 564 | /* |
565 | * Perform implict vfs_fsync_range() for fd_do_writev() ops | 565 | * Perform implicit vfs_fsync_range() for fd_do_writev() ops |
566 | * for SCSI WRITEs with Forced Unit Access (FUA) set. | 566 | * for SCSI WRITEs with Forced Unit Access (FUA) set. |
567 | * Allow this to happen independent of WCE=0 setting. | 567 | * Allow this to happen independent of WCE=0 setting. |
568 | */ | 568 | */ |
diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c index d1ae4c5c3ffd..2f5d77932c80 100644 --- a/drivers/target/target_core_pr.c +++ b/drivers/target/target_core_pr.c | |||
@@ -474,7 +474,7 @@ static int core_scsi3_pr_seq_non_holder( | |||
474 | * statement. | 474 | * statement. |
475 | */ | 475 | */ |
476 | if (!ret && !other_cdb) { | 476 | if (!ret && !other_cdb) { |
477 | pr_debug("Allowing explict CDB: 0x%02x for %s" | 477 | pr_debug("Allowing explicit CDB: 0x%02x for %s" |
478 | " reservation holder\n", cdb[0], | 478 | " reservation holder\n", cdb[0], |
479 | core_scsi3_pr_dump_type(pr_reg_type)); | 479 | core_scsi3_pr_dump_type(pr_reg_type)); |
480 | 480 | ||
@@ -507,7 +507,7 @@ static int core_scsi3_pr_seq_non_holder( | |||
507 | */ | 507 | */ |
508 | 508 | ||
509 | if (!registered_nexus) { | 509 | if (!registered_nexus) { |
510 | pr_debug("Allowing implict CDB: 0x%02x" | 510 | pr_debug("Allowing implicit CDB: 0x%02x" |
511 | " for %s reservation on unregistered" | 511 | " for %s reservation on unregistered" |
512 | " nexus\n", cdb[0], | 512 | " nexus\n", cdb[0], |
513 | core_scsi3_pr_dump_type(pr_reg_type)); | 513 | core_scsi3_pr_dump_type(pr_reg_type)); |
@@ -522,7 +522,7 @@ static int core_scsi3_pr_seq_non_holder( | |||
522 | * allow commands from registered nexuses. | 522 | * allow commands from registered nexuses. |
523 | */ | 523 | */ |
524 | 524 | ||
525 | pr_debug("Allowing implict CDB: 0x%02x for %s" | 525 | pr_debug("Allowing implicit CDB: 0x%02x for %s" |
526 | " reservation\n", cdb[0], | 526 | " reservation\n", cdb[0], |
527 | core_scsi3_pr_dump_type(pr_reg_type)); | 527 | core_scsi3_pr_dump_type(pr_reg_type)); |
528 | 528 | ||
@@ -683,7 +683,7 @@ static struct t10_pr_registration *__core_scsi3_alloc_registration( | |||
683 | alua_port_list) { | 683 | alua_port_list) { |
684 | /* | 684 | /* |
685 | * This pointer will be NULL for demo mode MappedLUNs | 685 | * This pointer will be NULL for demo mode MappedLUNs |
686 | * that have not been make explict via a ConfigFS | 686 | * that have not been make explicit via a ConfigFS |
687 | * MappedLUN group for the SCSI Initiator Node ACL. | 687 | * MappedLUN group for the SCSI Initiator Node ACL. |
688 | */ | 688 | */ |
689 | if (!deve_tmp->se_lun_acl) | 689 | if (!deve_tmp->se_lun_acl) |
@@ -1158,7 +1158,7 @@ static void core_scsi3_put_pr_reg(struct t10_pr_registration *pr_reg) | |||
1158 | smp_mb__after_atomic_dec(); | 1158 | smp_mb__after_atomic_dec(); |
1159 | } | 1159 | } |
1160 | 1160 | ||
1161 | static int core_scsi3_check_implict_release( | 1161 | static int core_scsi3_check_implicit_release( |
1162 | struct se_device *dev, | 1162 | struct se_device *dev, |
1163 | struct t10_pr_registration *pr_reg) | 1163 | struct t10_pr_registration *pr_reg) |
1164 | { | 1164 | { |
@@ -1174,7 +1174,7 @@ static int core_scsi3_check_implict_release( | |||
1174 | } | 1174 | } |
1175 | if (pr_res_holder == pr_reg) { | 1175 | if (pr_res_holder == pr_reg) { |
1176 | /* | 1176 | /* |
1177 | * Perform an implict RELEASE if the registration that | 1177 | * Perform an implicit RELEASE if the registration that |
1178 | * is being released is holding the reservation. | 1178 | * is being released is holding the reservation. |
1179 | * | 1179 | * |
1180 | * From spc4r17, section 5.7.11.1: | 1180 | * From spc4r17, section 5.7.11.1: |
@@ -1192,7 +1192,7 @@ static int core_scsi3_check_implict_release( | |||
1192 | * For 'All Registrants' reservation types, all existing | 1192 | * For 'All Registrants' reservation types, all existing |
1193 | * registrations are still processed as reservation holders | 1193 | * registrations are still processed as reservation holders |
1194 | * in core_scsi3_pr_seq_non_holder() after the initial | 1194 | * in core_scsi3_pr_seq_non_holder() after the initial |
1195 | * reservation holder is implictly released here. | 1195 | * reservation holder is implicitly released here. |
1196 | */ | 1196 | */ |
1197 | } else if (pr_reg->pr_reg_all_tg_pt && | 1197 | } else if (pr_reg->pr_reg_all_tg_pt && |
1198 | (!strcmp(pr_res_holder->pr_reg_nacl->initiatorname, | 1198 | (!strcmp(pr_res_holder->pr_reg_nacl->initiatorname, |
@@ -2125,7 +2125,7 @@ core_scsi3_emulate_pro_register(struct se_cmd *cmd, u64 res_key, u64 sa_res_key, | |||
2125 | /* | 2125 | /* |
2126 | * sa_res_key=0 Unregister Reservation Key for registered I_T Nexus. | 2126 | * sa_res_key=0 Unregister Reservation Key for registered I_T Nexus. |
2127 | */ | 2127 | */ |
2128 | pr_holder = core_scsi3_check_implict_release( | 2128 | pr_holder = core_scsi3_check_implicit_release( |
2129 | cmd->se_dev, pr_reg); | 2129 | cmd->se_dev, pr_reg); |
2130 | if (pr_holder < 0) { | 2130 | if (pr_holder < 0) { |
2131 | ret = TCM_RESERVATION_CONFLICT; | 2131 | ret = TCM_RESERVATION_CONFLICT; |
@@ -2402,7 +2402,7 @@ static void __core_scsi3_complete_pro_release( | |||
2402 | struct se_device *dev, | 2402 | struct se_device *dev, |
2403 | struct se_node_acl *se_nacl, | 2403 | struct se_node_acl *se_nacl, |
2404 | struct t10_pr_registration *pr_reg, | 2404 | struct t10_pr_registration *pr_reg, |
2405 | int explict) | 2405 | int explicit) |
2406 | { | 2406 | { |
2407 | struct target_core_fabric_ops *tfo = se_nacl->se_tpg->se_tpg_tfo; | 2407 | struct target_core_fabric_ops *tfo = se_nacl->se_tpg->se_tpg_tfo; |
2408 | char i_buf[PR_REG_ISID_ID_LEN]; | 2408 | char i_buf[PR_REG_ISID_ID_LEN]; |
@@ -2416,7 +2416,7 @@ static void __core_scsi3_complete_pro_release( | |||
2416 | 2416 | ||
2417 | pr_debug("SPC-3 PR [%s] Service Action: %s RELEASE cleared" | 2417 | pr_debug("SPC-3 PR [%s] Service Action: %s RELEASE cleared" |
2418 | " reservation holder TYPE: %s ALL_TG_PT: %d\n", | 2418 | " reservation holder TYPE: %s ALL_TG_PT: %d\n", |
2419 | tfo->get_fabric_name(), (explict) ? "explict" : "implict", | 2419 | tfo->get_fabric_name(), (explicit) ? "explicit" : "implicit", |
2420 | core_scsi3_pr_dump_type(pr_reg->pr_res_type), | 2420 | core_scsi3_pr_dump_type(pr_reg->pr_res_type), |
2421 | (pr_reg->pr_reg_all_tg_pt) ? 1 : 0); | 2421 | (pr_reg->pr_reg_all_tg_pt) ? 1 : 0); |
2422 | pr_debug("SPC-3 PR [%s] RELEASE Node: %s%s\n", | 2422 | pr_debug("SPC-3 PR [%s] RELEASE Node: %s%s\n", |
@@ -2692,7 +2692,7 @@ static void __core_scsi3_complete_pro_preempt( | |||
2692 | memset(i_buf, 0, PR_REG_ISID_ID_LEN); | 2692 | memset(i_buf, 0, PR_REG_ISID_ID_LEN); |
2693 | core_pr_dump_initiator_port(pr_reg, i_buf, PR_REG_ISID_ID_LEN); | 2693 | core_pr_dump_initiator_port(pr_reg, i_buf, PR_REG_ISID_ID_LEN); |
2694 | /* | 2694 | /* |
2695 | * Do an implict RELEASE of the existing reservation. | 2695 | * Do an implicit RELEASE of the existing reservation. |
2696 | */ | 2696 | */ |
2697 | if (dev->dev_pr_res_holder) | 2697 | if (dev->dev_pr_res_holder) |
2698 | __core_scsi3_complete_pro_release(dev, nacl, | 2698 | __core_scsi3_complete_pro_release(dev, nacl, |
@@ -2845,7 +2845,7 @@ core_scsi3_pro_preempt(struct se_cmd *cmd, int type, int scope, u64 res_key, | |||
2845 | * 5.7.11.4 Preempting, Table 52 and Figure 7. | 2845 | * 5.7.11.4 Preempting, Table 52 and Figure 7. |
2846 | * | 2846 | * |
2847 | * For a ZERO SA Reservation key, release | 2847 | * For a ZERO SA Reservation key, release |
2848 | * all other registrations and do an implict | 2848 | * all other registrations and do an implicit |
2849 | * release of active persistent reservation. | 2849 | * release of active persistent reservation. |
2850 | * | 2850 | * |
2851 | * For a non-ZERO SA Reservation key, only | 2851 | * For a non-ZERO SA Reservation key, only |
diff --git a/drivers/target/target_core_spc.c b/drivers/target/target_core_spc.c index f89a86f29ee3..021c3f4a4f00 100644 --- a/drivers/target/target_core_spc.c +++ b/drivers/target/target_core_spc.c | |||
@@ -48,7 +48,7 @@ static void spc_fill_alua_data(struct se_port *port, unsigned char *buf) | |||
48 | buf[5] = 0x80; | 48 | buf[5] = 0x80; |
49 | 49 | ||
50 | /* | 50 | /* |
51 | * Set TPGS field for explict and/or implict ALUA access type | 51 | * Set TPGS field for explicit and/or implicit ALUA access type |
52 | * and opteration. | 52 | * and opteration. |
53 | * | 53 | * |
54 | * See spc4r17 section 6.4.2 Table 135 | 54 | * See spc4r17 section 6.4.2 Table 135 |
@@ -1257,7 +1257,7 @@ spc_parse_cdb(struct se_cmd *cmd, unsigned int *size) | |||
1257 | *size = (cdb[3] << 8) + cdb[4]; | 1257 | *size = (cdb[3] << 8) + cdb[4]; |
1258 | 1258 | ||
1259 | /* | 1259 | /* |
1260 | * Do implict HEAD_OF_QUEUE processing for INQUIRY. | 1260 | * Do implicit HEAD_OF_QUEUE processing for INQUIRY. |
1261 | * See spc4r17 section 5.3 | 1261 | * See spc4r17 section 5.3 |
1262 | */ | 1262 | */ |
1263 | cmd->sam_task_attr = MSG_HEAD_TAG; | 1263 | cmd->sam_task_attr = MSG_HEAD_TAG; |
@@ -1291,7 +1291,7 @@ spc_parse_cdb(struct se_cmd *cmd, unsigned int *size) | |||
1291 | cmd->execute_cmd = spc_emulate_report_luns; | 1291 | cmd->execute_cmd = spc_emulate_report_luns; |
1292 | *size = (cdb[6] << 24) | (cdb[7] << 16) | (cdb[8] << 8) | cdb[9]; | 1292 | *size = (cdb[6] << 24) | (cdb[7] << 16) | (cdb[8] << 8) | cdb[9]; |
1293 | /* | 1293 | /* |
1294 | * Do implict HEAD_OF_QUEUE processing for REPORT_LUNS | 1294 | * Do implicit HEAD_OF_QUEUE processing for REPORT_LUNS |
1295 | * See spc4r17 section 5.3 | 1295 | * See spc4r17 section 5.3 |
1296 | */ | 1296 | */ |
1297 | cmd->sam_task_attr = MSG_HEAD_TAG; | 1297 | cmd->sam_task_attr = MSG_HEAD_TAG; |
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c index 46d82295fac9..269a7987dab9 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c | |||
@@ -462,7 +462,7 @@ void transport_deregister_session(struct se_session *se_sess) | |||
462 | pr_debug("TARGET_CORE[%s]: Deregistered fabric_sess\n", | 462 | pr_debug("TARGET_CORE[%s]: Deregistered fabric_sess\n", |
463 | se_tpg->se_tpg_tfo->get_fabric_name()); | 463 | se_tpg->se_tpg_tfo->get_fabric_name()); |
464 | /* | 464 | /* |
465 | * If last kref is dropping now for an explict NodeACL, awake sleeping | 465 | * If last kref is dropping now for an explicit NodeACL, awake sleeping |
466 | * ->acl_free_comp caller to wakeup configfs se_node_acl->acl_group | 466 | * ->acl_free_comp caller to wakeup configfs se_node_acl->acl_group |
467 | * removal context. | 467 | * removal context. |
468 | */ | 468 | */ |
@@ -636,7 +636,7 @@ void target_complete_cmd(struct se_cmd *cmd, u8 scsi_status) | |||
636 | cmd->transport_state |= CMD_T_FAILED; | 636 | cmd->transport_state |= CMD_T_FAILED; |
637 | 637 | ||
638 | /* | 638 | /* |
639 | * Check for case where an explict ABORT_TASK has been received | 639 | * Check for case where an explicit ABORT_TASK has been received |
640 | * and transport_wait_for_tasks() will be waiting for completion.. | 640 | * and transport_wait_for_tasks() will be waiting for completion.. |
641 | */ | 641 | */ |
642 | if (cmd->transport_state & CMD_T_ABORTED && | 642 | if (cmd->transport_state & CMD_T_ABORTED && |
diff --git a/drivers/target/target_core_ua.h b/drivers/target/target_core_ua.h index 0204952fe4d3..be912b36daae 100644 --- a/drivers/target/target_core_ua.h +++ b/drivers/target/target_core_ua.h | |||
@@ -19,7 +19,7 @@ | |||
19 | #define ASCQ_2AH_RESERVATIONS_RELEASED 0x04 | 19 | #define ASCQ_2AH_RESERVATIONS_RELEASED 0x04 |
20 | #define ASCQ_2AH_REGISTRATIONS_PREEMPTED 0x05 | 20 | #define ASCQ_2AH_REGISTRATIONS_PREEMPTED 0x05 |
21 | #define ASCQ_2AH_ASYMMETRIC_ACCESS_STATE_CHANGED 0x06 | 21 | #define ASCQ_2AH_ASYMMETRIC_ACCESS_STATE_CHANGED 0x06 |
22 | #define ASCQ_2AH_IMPLICT_ASYMMETRIC_ACCESS_STATE_TRANSITION_FAILED 0x07 | 22 | #define ASCQ_2AH_IMPLICIT_ASYMMETRIC_ACCESS_STATE_TRANSITION_FAILED 0x07 |
23 | #define ASCQ_2AH_PRIORITY_CHANGED 0x08 | 23 | #define ASCQ_2AH_PRIORITY_CHANGED 0x08 |
24 | 24 | ||
25 | #define ASCQ_2CH_PREVIOUS_RESERVATION_CONFLICT_STATUS 0x09 | 25 | #define ASCQ_2CH_PREVIOUS_RESERVATION_CONFLICT_STATUS 0x09 |