From 4c8770a405b105fe48e850413b2e772670039f4a Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Sat, 16 Feb 2013 13:56:17 -0800 Subject: [PATCH] Renamed group reservation routines with prin_*/prout_* Renamed group reservation helper functions with prin_* or prout_*, making it more clear what they are doing. --- test-tool/1120_persistent_register_simple.c | 10 +++++----- test-tool/1130_persistent_reserve_simple.c | 10 +++++----- .../1140_persistent_reserve_access_check_ea.c | 14 +++++++------- .../1141_persistent_reserve_access_check_we.c | 14 +++++++------- .../1142_persistent_reserve_access_check_earo.c | 14 +++++++------- .../1143_persistent_reserve_access_check_wero.c | 14 +++++++------- .../1144_persistent_reserve_access_check_eaar.c | 14 +++++++------- .../1145_persistent_reserve_access_check_wear.c | 14 +++++++------- test-tool/iscsi-support.c | 15 +++++++-------- test-tool/iscsi-support.h | 14 +++++++------- 10 files changed, 66 insertions(+), 67 deletions(-) diff --git a/test-tool/1120_persistent_register_simple.c b/test-tool/1120_persistent_register_simple.c index a52a5a6..8e83b14 100644 --- a/test-tool/1120_persistent_register_simple.c +++ b/test-tool/1120_persistent_register_simple.c @@ -60,32 +60,32 @@ int T1120_persistent_register_simple(const char *initiator, const char *url) ret = 0; /* register our reservation key with the target */ - ret = register_and_ignore(iscsi, lun, key); + ret = prout_register_and_ignore(iscsi, lun, key); if (ret != 0) { goto finished; } /* verify we can read the registration */ - ret = verify_key_presence(iscsi, lun, key, 1); + ret = prin_verify_key_presence(iscsi, lun, key, 1); if (ret != 0) { goto finished; } /* try to reregister, which should fail */ - ret = reregister_key_fails(iscsi, lun, key+1); + ret = prout_reregister_key_fails(iscsi, lun, key+1); if (ret != 0) { goto finished; } /* release from the target */ - ret = register_key(iscsi, lun, 0, key); + ret = prout_register_key(iscsi, lun, 0, key); if (ret != 0) { goto finished; } /* Verify the registration is gone */ /* verify we can read the registration */ - ret = verify_key_presence(iscsi, lun, key, 0); + ret = prin_verify_key_presence(iscsi, lun, key, 0); if (ret != 0) { goto finished; } diff --git a/test-tool/1130_persistent_reserve_simple.c b/test-tool/1130_persistent_reserve_simple.c index 8b75b7b..8127c5d 100644 --- a/test-tool/1130_persistent_reserve_simple.c +++ b/test-tool/1130_persistent_reserve_simple.c @@ -78,7 +78,7 @@ int T1130_persistent_reserve_simple(const char *initiator, const char *url) ret = 0; /* register our reservation key with the target */ - ret = register_and_ignore(iscsi, lun, key); + ret = prout_register_and_ignore(iscsi, lun, key); if (ret != 0) goto finished; @@ -87,25 +87,25 @@ int T1130_persistent_reserve_simple(const char *initiator, const char *url) enum scsi_persistent_out_type pr_type = pr_types_to_test[i]; /* reserve the target */ - ret = reserve(iscsi, lun, key, pr_type); + ret = prout_reserve(iscsi, lun, key, pr_type); if (ret != 0) goto finished; /* verify target reservation */ - ret = verify_reserved_as(iscsi, lun, + ret = prin_verify_reserved_as(iscsi, lun, pr_type_is_all_registrants(pr_type) ? 0 : key, pr_type); if (ret != 0) goto finished; /* release our reservation */ - ret = release(iscsi, lun, key, pr_type); + ret = prout_release(iscsi, lun, key, pr_type); if (ret != 0) goto finished; } /* remove our key from the target */ - ret = register_key(iscsi, lun, 0, key); + ret = prout_register_key(iscsi, lun, 0, key); if (ret != 0) goto finished; diff --git a/test-tool/1140_persistent_reserve_access_check_ea.c b/test-tool/1140_persistent_reserve_access_check_ea.c index 79bffe7..79e5738 100644 --- a/test-tool/1140_persistent_reserve_access_check_ea.c +++ b/test-tool/1140_persistent_reserve_access_check_ea.c @@ -76,20 +76,20 @@ int T1140_persistent_reserve_access_check_ea(const char *initiator, } /* register our reservation key with the target */ - ret = register_and_ignore(iscsi, lun, key); + ret = prout_register_and_ignore(iscsi, lun, key); if (ret != 0) goto finished; - ret = register_and_ignore(iscsi2, lun2, key2); + ret = prout_register_and_ignore(iscsi2, lun2, key2); if (ret != 0) goto finished; /* reserve the target through initiator 1 */ - ret = reserve(iscsi, lun, key, pr_type); + ret = prout_reserve(iscsi, lun, key, pr_type); if (ret != 0) goto finished; /* verify target reservation */ - ret = verify_reserved_as(iscsi, lun, + ret = prin_verify_reserved_as(iscsi, lun, pr_type_is_all_registrants(pr_type) ? 0 : key, pr_type); if (ret != 0) @@ -123,7 +123,7 @@ int T1140_persistent_reserve_access_check_ea(const char *initiator, goto finished; /* unregister init2 */ - ret = register_key(iscsi2, lun2, 0, key); + ret = prout_register_key(iscsi2, lun2, 0, key); if (ret != 0) { goto finished; } @@ -139,12 +139,12 @@ int T1140_persistent_reserve_access_check_ea(const char *initiator, goto finished; /* release our reservation */ - ret = release(iscsi, lun, key, pr_type); + ret = prout_release(iscsi, lun, key, pr_type); if (ret != 0) goto finished; /* remove our key from the target */ - ret = register_key(iscsi, lun, 0, key); + ret = prout_register_key(iscsi, lun, 0, key); if (ret != 0) goto finished; diff --git a/test-tool/1141_persistent_reserve_access_check_we.c b/test-tool/1141_persistent_reserve_access_check_we.c index db73566..239b8af 100644 --- a/test-tool/1141_persistent_reserve_access_check_we.c +++ b/test-tool/1141_persistent_reserve_access_check_we.c @@ -76,20 +76,20 @@ int T1141_persistent_reserve_access_check_we(const char *initiator, } /* register our reservation key with the target */ - ret = register_and_ignore(iscsi, lun, key); + ret = prout_register_and_ignore(iscsi, lun, key); if (ret != 0) goto finished; - ret = register_and_ignore(iscsi2, lun2, key2); + ret = prout_register_and_ignore(iscsi2, lun2, key2); if (ret != 0) goto finished; /* reserve the target through initiator 1 */ - ret = reserve(iscsi, lun, key, pr_type); + ret = prout_reserve(iscsi, lun, key, pr_type); if (ret != 0) goto finished; /* verify target reservation */ - ret = verify_reserved_as(iscsi, lun, + ret = prin_verify_reserved_as(iscsi, lun, pr_type_is_all_registrants(pr_type) ? 0 : key, pr_type); if (ret != 0) @@ -123,7 +123,7 @@ int T1141_persistent_reserve_access_check_we(const char *initiator, goto finished; /* unregister init2 */ - ret = register_key(iscsi2, lun2, 0, key); + ret = prout_register_key(iscsi2, lun2, 0, key); if (ret != 0) { goto finished; } @@ -139,12 +139,12 @@ int T1141_persistent_reserve_access_check_we(const char *initiator, goto finished; /* release our reservation */ - ret = release(iscsi, lun, key, pr_type); + ret = prout_release(iscsi, lun, key, pr_type); if (ret != 0) goto finished; /* remove our key from the target */ - ret = register_key(iscsi, lun, 0, key); + ret = prout_register_key(iscsi, lun, 0, key); if (ret != 0) goto finished; diff --git a/test-tool/1142_persistent_reserve_access_check_earo.c b/test-tool/1142_persistent_reserve_access_check_earo.c index 90f8af2..b3e8877 100644 --- a/test-tool/1142_persistent_reserve_access_check_earo.c +++ b/test-tool/1142_persistent_reserve_access_check_earo.c @@ -76,20 +76,20 @@ int T1142_persistent_reserve_access_check_earo(const char *initiator, } /* register our reservation key with the target */ - ret = register_and_ignore(iscsi, lun, key); + ret = prout_register_and_ignore(iscsi, lun, key); if (ret != 0) goto finished; - ret = register_and_ignore(iscsi2, lun2, key2); + ret = prout_register_and_ignore(iscsi2, lun2, key2); if (ret != 0) goto finished; /* reserve the target through initiator 1 */ - ret = reserve(iscsi, lun, key, pr_type); + ret = prout_reserve(iscsi, lun, key, pr_type); if (ret != 0) goto finished; /* verify target reservation */ - ret = verify_reserved_as(iscsi, lun, + ret = prin_verify_reserved_as(iscsi, lun, pr_type_is_all_registrants(pr_type) ? 0 : key, pr_type); if (ret != 0) @@ -123,7 +123,7 @@ int T1142_persistent_reserve_access_check_earo(const char *initiator, goto finished; /* unregister init2 */ - ret = register_key(iscsi2, lun2, 0, key); + ret = prout_register_key(iscsi2, lun2, 0, key); if (ret != 0) { goto finished; } @@ -139,12 +139,12 @@ int T1142_persistent_reserve_access_check_earo(const char *initiator, goto finished; /* release our reservation */ - ret = release(iscsi, lun, key, pr_type); + ret = prout_release(iscsi, lun, key, pr_type); if (ret != 0) goto finished; /* remove our key from the target */ - ret = register_key(iscsi, lun, 0, key); + ret = prout_register_key(iscsi, lun, 0, key); if (ret != 0) goto finished; diff --git a/test-tool/1143_persistent_reserve_access_check_wero.c b/test-tool/1143_persistent_reserve_access_check_wero.c index ac766d9..faf32c6 100644 --- a/test-tool/1143_persistent_reserve_access_check_wero.c +++ b/test-tool/1143_persistent_reserve_access_check_wero.c @@ -76,20 +76,20 @@ int T1143_persistent_reserve_access_check_wero(const char *initiator, } /* register our reservation key with the target */ - ret = register_and_ignore(iscsi, lun, key); + ret = prout_register_and_ignore(iscsi, lun, key); if (ret != 0) goto finished; - ret = register_and_ignore(iscsi2, lun2, key2); + ret = prout_register_and_ignore(iscsi2, lun2, key2); if (ret != 0) goto finished; /* reserve the target through initiator 1 */ - ret = reserve(iscsi, lun, key, pr_type); + ret = prout_reserve(iscsi, lun, key, pr_type); if (ret != 0) goto finished; /* verify target reservation */ - ret = verify_reserved_as(iscsi, lun, + ret = prin_verify_reserved_as(iscsi, lun, pr_type_is_all_registrants(pr_type) ? 0 : key, pr_type); if (ret != 0) @@ -123,7 +123,7 @@ int T1143_persistent_reserve_access_check_wero(const char *initiator, goto finished; /* unregister init2 */ - ret = register_key(iscsi2, lun2, 0, key); + ret = prout_register_key(iscsi2, lun2, 0, key); if (ret != 0) { goto finished; } @@ -139,12 +139,12 @@ int T1143_persistent_reserve_access_check_wero(const char *initiator, goto finished; /* release our reservation */ - ret = release(iscsi, lun, key, pr_type); + ret = prout_release(iscsi, lun, key, pr_type); if (ret != 0) goto finished; /* remove our key from the target */ - ret = register_key(iscsi, lun, 0, key); + ret = prout_register_key(iscsi, lun, 0, key); if (ret != 0) goto finished; diff --git a/test-tool/1144_persistent_reserve_access_check_eaar.c b/test-tool/1144_persistent_reserve_access_check_eaar.c index 511172c..fdf955a 100644 --- a/test-tool/1144_persistent_reserve_access_check_eaar.c +++ b/test-tool/1144_persistent_reserve_access_check_eaar.c @@ -76,20 +76,20 @@ int T1144_persistent_reserve_access_check_eaar(const char *initiator, } /* register our reservation key with the target */ - ret = register_and_ignore(iscsi, lun, key); + ret = prout_register_and_ignore(iscsi, lun, key); if (ret != 0) goto finished; - ret = register_and_ignore(iscsi2, lun2, key2); + ret = prout_register_and_ignore(iscsi2, lun2, key2); if (ret != 0) goto finished; /* reserve the target through initiator 1 */ - ret = reserve(iscsi, lun, key, pr_type); + ret = prout_reserve(iscsi, lun, key, pr_type); if (ret != 0) goto finished; /* verify target reservation */ - ret = verify_reserved_as(iscsi, lun, + ret = prin_verify_reserved_as(iscsi, lun, pr_type_is_all_registrants(pr_type) ? 0 : key, pr_type); if (ret != 0) @@ -123,7 +123,7 @@ int T1144_persistent_reserve_access_check_eaar(const char *initiator, goto finished; /* unregister init2 */ - ret = register_key(iscsi2, lun2, 0, key); + ret = prout_register_key(iscsi2, lun2, 0, key); if (ret != 0) { goto finished; } @@ -139,12 +139,12 @@ int T1144_persistent_reserve_access_check_eaar(const char *initiator, goto finished; /* release our reservation */ - ret = release(iscsi, lun, key, pr_type); + ret = prout_release(iscsi, lun, key, pr_type); if (ret != 0) goto finished; /* remove our key from the target */ - ret = register_key(iscsi, lun, 0, key); + ret = prout_register_key(iscsi, lun, 0, key); if (ret != 0) goto finished; diff --git a/test-tool/1145_persistent_reserve_access_check_wear.c b/test-tool/1145_persistent_reserve_access_check_wear.c index 36f9af0..002d2cd 100644 --- a/test-tool/1145_persistent_reserve_access_check_wear.c +++ b/test-tool/1145_persistent_reserve_access_check_wear.c @@ -76,20 +76,20 @@ int T1145_persistent_reserve_access_check_wear(const char *initiator, } /* register our reservation key with the target */ - ret = register_and_ignore(iscsi, lun, key); + ret = prout_register_and_ignore(iscsi, lun, key); if (ret != 0) goto finished; - ret = register_and_ignore(iscsi2, lun2, key2); + ret = prout_register_and_ignore(iscsi2, lun2, key2); if (ret != 0) goto finished; /* reserve the target through initiator 1 */ - ret = reserve(iscsi, lun, key, pr_type); + ret = prout_reserve(iscsi, lun, key, pr_type); if (ret != 0) goto finished; /* verify target reservation */ - ret = verify_reserved_as(iscsi, lun, + ret = prin_verify_reserved_as(iscsi, lun, pr_type_is_all_registrants(pr_type) ? 0 : key, pr_type); if (ret != 0) @@ -123,7 +123,7 @@ int T1145_persistent_reserve_access_check_wear(const char *initiator, goto finished; /* unregister init2 */ - ret = register_key(iscsi2, lun2, 0, key); + ret = prout_register_key(iscsi2, lun2, 0, key); if (ret != 0) { goto finished; } @@ -139,12 +139,12 @@ int T1145_persistent_reserve_access_check_wear(const char *initiator, goto finished; /* release our reservation */ - ret = release(iscsi, lun, key, pr_type); + ret = prout_release(iscsi, lun, key, pr_type); if (ret != 0) goto finished; /* remove our key from the target */ - ret = register_key(iscsi, lun, 0, key); + ret = prout_register_key(iscsi, lun, 0, key); if (ret != 0) goto finished; diff --git a/test-tool/iscsi-support.c b/test-tool/iscsi-support.c index 1d32c31..978564b 100644 --- a/test-tool/iscsi-support.c +++ b/test-tool/iscsi-support.c @@ -240,7 +240,7 @@ prin_read_keys(struct iscsi_context *iscsi, int lun, struct scsi_task **tp, int -register_and_ignore(struct iscsi_context *iscsi, int lun, +prout_register_and_ignore(struct iscsi_context *iscsi, int lun, unsigned long long sark) { struct scsi_persistent_reserve_out_basic poc; @@ -285,7 +285,7 @@ register_and_ignore(struct iscsi_context *iscsi, int lun, int -register_key(struct iscsi_context *iscsi, int lun, +prout_register_key(struct iscsi_context *iscsi, int lun, unsigned long long sark, unsigned long long rk) { struct scsi_persistent_reserve_out_basic poc; @@ -324,7 +324,7 @@ register_key(struct iscsi_context *iscsi, int lun, int -verify_key_presence(struct iscsi_context *iscsi, int lun, +prin_verify_key_presence(struct iscsi_context *iscsi, int lun, unsigned long long key, int present) { struct scsi_task *task; @@ -384,7 +384,7 @@ verify_key_presence(struct iscsi_context *iscsi, int lun, int -reregister_key_fails(struct iscsi_context *iscsi, int lun, +prout_reregister_key_fails(struct iscsi_context *iscsi, int lun, unsigned long long sark) { struct scsi_persistent_reserve_out_basic poc; @@ -430,7 +430,7 @@ reregister_key_fails(struct iscsi_context *iscsi, int lun, int -reserve(struct iscsi_context *iscsi, int lun, +prout_reserve(struct iscsi_context *iscsi, int lun, unsigned long long key, enum scsi_persistent_out_type pr_type) { struct scsi_persistent_reserve_out_basic poc; @@ -470,7 +470,7 @@ reserve(struct iscsi_context *iscsi, int lun, int -release(struct iscsi_context *iscsi, int lun, +prout_release(struct iscsi_context *iscsi, int lun, unsigned long long key, enum scsi_persistent_out_type pr_type) { struct scsi_persistent_reserve_out_basic poc; @@ -508,7 +508,7 @@ release(struct iscsi_context *iscsi, int lun, } int -verify_reserved_as(struct iscsi_context *iscsi, int lun, +prin_verify_reserved_as(struct iscsi_context *iscsi, int lun, unsigned long long key, enum scsi_persistent_out_type pr_type) { struct scsi_task *task; @@ -566,7 +566,6 @@ verify_reserved_as(struct iscsi_context *iscsi, int lun, return 0; } - int verify_read_works(struct iscsi_context *iscsi, int lun, unsigned char *buf) { diff --git a/test-tool/iscsi-support.h b/test-tool/iscsi-support.h index 9b39215..e543c31 100644 --- a/test-tool/iscsi-support.h +++ b/test-tool/iscsi-support.h @@ -168,19 +168,19 @@ static inline int pr_type_is_all_registrants( int prin_read_keys(struct iscsi_context *iscsi, int lun, struct scsi_task **tp, struct scsi_persistent_reserve_in_read_keys **rkp); -int register_and_ignore(struct iscsi_context *iscsi, int lun, +int prout_register_and_ignore(struct iscsi_context *iscsi, int lun, unsigned long long key); -int register_key(struct iscsi_context *iscsi, int lun, +int prout_register_key(struct iscsi_context *iscsi, int lun, unsigned long long sark, unsigned long long rk); -int verify_key_presence(struct iscsi_context *iscsi, int lun, +int prin_verify_key_presence(struct iscsi_context *iscsi, int lun, unsigned long long key, int present); -int reregister_key_fails(struct iscsi_context *iscsi, int lun, +int prout_reregister_key_fails(struct iscsi_context *iscsi, int lun, unsigned long long sark); -int reserve(struct iscsi_context *iscsi, int lun, +int prout_reserve(struct iscsi_context *iscsi, int lun, unsigned long long key, enum scsi_persistent_out_type pr_type); -int release(struct iscsi_context *iscsi, int lun, +int prout_release(struct iscsi_context *iscsi, int lun, unsigned long long key, enum scsi_persistent_out_type pr_type); -int verify_reserved_as(struct iscsi_context *iscsi, int lun, +int prin_verify_reserved_as(struct iscsi_context *iscsi, int lun, unsigned long long key, enum scsi_persistent_out_type pr_type); int verify_read_works(struct iscsi_context *iscsi, int lun, unsigned char *buf); int verify_write_works(struct iscsi_context *iscsi, int lun, unsigned char *buf);