target/pr: cleanup core_scsi3_pr_seq_non_holder

Clean up the mess of registered variables, and pass the isid mismatch
flag explicitly instead of overloading the registration type.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
index 48ed5d2bf5fe34a2e33666c1037c3f36820dfa1b..1e89679ad6066ae034aef4d83c8170101e7c5646 100644 (file)
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
@@ -312,34 +312,31 @@ out:
  * This function is called by those initiator ports who are *NOT*
  * the active PR reservation holder when a reservation is present.
  */
-static int core_scsi3_pr_seq_non_holder(
-       struct se_cmd *cmd,
-       u32 pr_reg_type)
+static int core_scsi3_pr_seq_non_holder(struct se_cmd *cmd, u32 pr_reg_type,
+                                       bool isid_mismatch)
 {
        unsigned char *cdb = cmd->t_task_cdb;
-       struct se_dev_entry *se_deve;
        struct se_session *se_sess = cmd->se_sess;
        struct se_node_acl *nacl = se_sess->se_node_acl;
-       int other_cdb = 0, ignore_reg;
+       int other_cdb = 0;
        int registered_nexus = 0, ret = 1; /* Conflict by default */
        int all_reg = 0, reg_only = 0; /* ALL_REG, REG_ONLY */
        int we = 0; /* Write Exclusive */
        int legacy = 0; /* Act like a legacy device and return
                         * RESERVATION CONFLICT on some CDBs */
-       bool registered = false;
 
-       rcu_read_lock();
-       se_deve = target_nacl_find_deve(nacl, cmd->orig_fe_lun);
-       if (se_deve)
-               registered = test_bit(DEF_PR_REG_ACTIVE, &se_deve->deve_flags);
-       rcu_read_unlock();
-       /*
-        * Determine if the registration should be ignored due to
-        * non-matching ISIDs in target_scsi3_pr_reservation_check().
-        */
-       ignore_reg = (pr_reg_type & 0x80000000);
-       if (ignore_reg)
-               pr_reg_type &= ~0x80000000;
+       if (isid_mismatch) {
+               registered_nexus = 0;
+       } else {
+               struct se_dev_entry *se_deve;
+
+               rcu_read_lock();
+               se_deve = target_nacl_find_deve(nacl, cmd->orig_fe_lun);
+               if (se_deve)
+                       registered_nexus = test_bit(DEF_PR_REG_ACTIVE,
+                                                   &se_deve->deve_flags);
+               rcu_read_unlock();
+       }
 
        switch (pr_reg_type) {
        case PR_TYPE_WRITE_EXCLUSIVE:
@@ -349,8 +346,6 @@ static int core_scsi3_pr_seq_non_holder(
                 * Some commands are only allowed for the persistent reservation
                 * holder.
                 */
-               if ((registered) && !(ignore_reg))
-                       registered_nexus = 1;
                break;
        case PR_TYPE_WRITE_EXCLUSIVE_REGONLY:
                we = 1;
@@ -359,8 +354,6 @@ static int core_scsi3_pr_seq_non_holder(
                 * Some commands are only allowed for registered I_T Nexuses.
                 */
                reg_only = 1;
-               if ((registered) && !(ignore_reg))
-                       registered_nexus = 1;
                break;
        case PR_TYPE_WRITE_EXCLUSIVE_ALLREG:
                we = 1;
@@ -369,8 +362,6 @@ static int core_scsi3_pr_seq_non_holder(
                 * Each registered I_T Nexus is a reservation holder.
                 */
                all_reg = 1;
-               if ((registered) && !(ignore_reg))
-                       registered_nexus = 1;
                break;
        default:
                return -EINVAL;
@@ -576,6 +567,7 @@ target_scsi3_pr_reservation_check(struct se_cmd *cmd)
        struct se_device *dev = cmd->se_dev;
        struct se_session *sess = cmd->se_sess;
        u32 pr_reg_type;
+       bool isid_mismatch = false;
 
        if (!dev->dev_pr_res_holder)
                return 0;
@@ -588,7 +580,7 @@ target_scsi3_pr_reservation_check(struct se_cmd *cmd)
        if (dev->dev_pr_res_holder->isid_present_at_reg) {
                if (dev->dev_pr_res_holder->pr_reg_bin_isid !=
                    sess->sess_bin_isid) {
-                       pr_reg_type |= 0x80000000;
+                       isid_mismatch = true;
                        goto check_nonholder;
                }
        }
@@ -596,7 +588,7 @@ target_scsi3_pr_reservation_check(struct se_cmd *cmd)
        return 0;
 
 check_nonholder:
-       if (core_scsi3_pr_seq_non_holder(cmd, pr_reg_type))
+       if (core_scsi3_pr_seq_non_holder(cmd, pr_reg_type, isid_mismatch))
                return TCM_RESERVATION_CONFLICT;
        return 0;
 }