Skip to contentSkip to conversation

target/core: Declare target_release_reservation() 'static'

PATCH Applied Bart Van Assche 3 participants 3 messages Nov 11, 2019 – Nov 13, 2019 SCSI target

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 target/core: Declare target_release_reservation() 'static'

Since this function is only used inside the source file in which it has been defined, declare it 'static'. See also commit fae43461f8f2 ("scsi:
target/core: Rework the SPC-2 reservation handling code").

---
 drivers/target/target_core_pr.c | 2 +-
 drivers/target/target_core_pr.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/target/target_core_pr.c +1 -1
index 5e931690e697..6a72b61e0076 100644
@@ -187,7 +187,7 @@ static int target_check_scsi2_reservation_conflict(struct se_cmd *cmd)
 	return 0;
 }
 
-void target_release_reservation(struct se_device *dev)
+static void target_release_reservation(struct se_device *dev)
 {
 	dev->reservation_holder = NULL;
 	dev->dev_reservation_flags &= ~DRF_SPC2_RESERVATIONS;
drivers/target/target_core_pr.h +0 -1
index a31c93e4e19c..198fad5c89dc 100644
@@ -58,7 +58,6 @@ extern struct kmem_cache *t10_pr_reg_cache;
 
 extern void core_pr_dump_initiator_port(struct t10_pr_registration *,
 			char *, u32);
-extern void target_release_reservation(struct se_device *dev);
 extern sense_reason_t target_scsi2_reservation_release(struct se_cmd *);
 extern sense_reason_t target_scsi2_reservation_reserve(struct se_cmd *);
 extern int core_scsi3_alloc_aptpl_registration(
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog
Reviewed-by on v1 1/2
#1 lore raw
Quoted 39 lines · Bart Van Assche

Since this function is only used inside the source file in which it has been defined, declare it 'static'. See also commit fae43461f8f2 ("scsi:
target/core: Rework the SPC-2 reservation handling code").

---
 drivers/target/target_core_pr.c | 2 +-
 drivers/target/target_core_pr.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/target/target_core_pr.c +1 -1
index 5e931690e697..6a72b61e0076 100644
@@ -187,7 +187,7 @@ static int target_check_scsi2_reservation_conflict(struct se_cmd *cmd)
 	return 0;
 }
 
-void target_release_reservation(struct se_device *dev)
+static void target_release_reservation(struct se_device *dev)
 {
 	dev->reservation_holder = NULL;
 	dev->dev_reservation_flags &= ~DRF_SPC2_RESERVATIONS;
drivers/target/target_core_pr.h +0 -1
index a31c93e4e19c..198fad5c89dc 100644
@@ -58,7 +58,6 @@ extern struct kmem_cache *t10_pr_reg_cache;
 
 extern void core_pr_dump_initiator_port(struct t10_pr_registration *,
 			char *, u32);
-extern void target_release_reservation(struct se_device *dev);
 extern sense_reason_t target_scsi2_reservation_release(struct se_cmd *);
 extern sense_reason_t target_scsi2_reservation_reserve(struct se_cmd *);
 extern int core_scsi3_alloc_aptpl_registration(
Signature · 1 line
2.24.0.rc1.363.gb1bccd3e3d-goog

Thanks,
Roman

#2 lore raw
In reply to Bart Van Assche

Bart,

Quoted 3 lines

Since this function is only used inside the source file in which it has been defined, declare it 'static'. See also commit fae43461f8f2 ("scsi:
target/core: Rework the SPC-2 reservation handling code").

Applied to 5.5/scsi-queue, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering