[RFC,15/48] target: core: remove unused variable in se_dev_entry

Commit Message

Dmitry Bogdanov Dec. 1, 2021, 3:42 p.m. UTC

deve->pr_res_key is never set, and se_cmd->pr_res_key is set in
the checks inside __target_execute_cmd

Signed-off-by: Dmitry Bogdanov <[e-mail]>
---
 drivers/target/target_core_device.c | 2 --
 include/target/target_core_base.h   | 4 ----
 2 files changed, 6 deletions(-)

Patch

diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
index 40a582b084d7..c0e4fb7b95d6 100644
--- a/drivers/target/target_core_device.c
+++ b/drivers/target/target_core_device.c
@@ -83,7 +83,6 @@  transport_lookup_cmd_lun(struct se_cmd *se_cmd)
 		}
 
 		se_cmd->se_lun = se_lun;
-		se_cmd->pr_res_key = deve->pr_res_key;
 		se_cmd->se_cmd_flags |= SCF_SE_LUN_CMD;
 		se_cmd->lun_ref_active = true;
 	}
@@ -160,7 +159,6 @@  int transport_lookup_tmr_lun(struct se_cmd *se_cmd)
 		}
 
 		se_cmd->se_lun = se_lun;
-		se_cmd->pr_res_key = deve->pr_res_key;
 		se_cmd->se_cmd_flags |= SCF_SE_LUN_CMD;
 		se_cmd->lun_ref_active = true;
 	}
diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 7e13db647faa..91c068525c02 100644
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -379,8 +379,6 @@  struct t10_pr_registration {
 };
 
 struct t10_reservation {
-	/* Reservation effects all target ports */
-	int pr_all_tg_pt;
 	/* Activate Persistence across Target Power Loss enabled
 	 * for SCSI device */
 	int pr_aptpl_active;
@@ -398,7 +396,6 @@  struct t10_reservation {
 	 * a single *pr_res_holder of the reservation, but all
 	 * registrations are considered reservation holders.
 	 */
-	struct se_node_acl *pr_res_holder;
 	struct list_head registration_list;
 	struct list_head aptpl_reg_list;
 };
@@ -656,7 +653,6 @@  struct se_lun_acl {
 
 struct se_dev_entry {
 	u64			mapped_lun;
-	u64			pr_res_key;
 	u64			creation_time;
 	bool			lun_access_ro;
 	u32			attach_count;