admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

minor cleanup of persistent reserve access test

Browse Source 
Renamed helper function to not conflict with new
names, and cleaned up the include file list.
This commit is contained in:
Lee Duncan
2013-02-20 13:09:00 -08:00
committed by Ronnie Sahlberg
parent 473172813b
commit c4df17e794
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test-tool/test_prout_reserve_access.c
View File

@@ -17,8 +17,6 @@
#include <stdio.h> #include <stdio.h>
#include <arpa/inet.h> #include <arpa/inet.h>
// #include <string.h>
#include <CUnit/CUnit.h> #include <CUnit/CUnit.h>
#include "iscsi.h" #include "iscsi.h"
@@ -27,7 +25,7 @@
static void static void
verify_persistent_reserve(struct iscsi_context *iscsi1, int lun1, verify_persistent_reserve_access(struct iscsi_context *iscsi1, int lun1,
struct iscsi_context *iscsi2, int lun2, struct iscsi_context *iscsi2, int lun2,
const enum scsi_persistent_out_type pr_type, const enum scsi_persistent_out_type pr_type,
int reg_i2_can_read, int reg_i2_can_read,
@@ -120,7 +118,7 @@ verify_persistent_reserve(struct iscsi_context *iscsi1, int lun1,
void void
test_prout_reserve_access_ea(void) test_prout_reserve_access_ea(void)
{ {
verify_persistent_reserve(iscsic, tgt_lun, iscsic2, tgt_lun2, verify_persistent_reserve_access(iscsic, tgt_lun, iscsic2, tgt_lun2,
SCSI_PERSISTENT_RESERVE_TYPE_EXCLUSIVE_ACCESS, SCSI_PERSISTENT_RESERVE_TYPE_EXCLUSIVE_ACCESS,
0, 0, 0, 0); 0, 0, 0, 0);
} }
@@ -128,7 +126,7 @@ test_prout_reserve_access_ea(void)
void void
test_prout_reserve_access_we(void) test_prout_reserve_access_we(void)
{ {
verify_persistent_reserve(iscsic, tgt_lun, iscsic2, tgt_lun2, verify_persistent_reserve_access(iscsic, tgt_lun, iscsic2, tgt_lun2,
SCSI_PERSISTENT_RESERVE_TYPE_WRITE_EXCLUSIVE, SCSI_PERSISTENT_RESERVE_TYPE_WRITE_EXCLUSIVE,
1, 0, 1, 0); 1, 0, 1, 0);
} }
@@ -136,7 +134,7 @@ test_prout_reserve_access_we(void)
void void
test_prout_reserve_access_earo(void) test_prout_reserve_access_earo(void)
{ {
verify_persistent_reserve(iscsic, tgt_lun, iscsic2, tgt_lun2, verify_persistent_reserve_access(iscsic, tgt_lun, iscsic2, tgt_lun2,
SCSI_PERSISTENT_RESERVE_TYPE_EXCLUSIVE_ACCESS_REGISTRANTS_ONLY, SCSI_PERSISTENT_RESERVE_TYPE_EXCLUSIVE_ACCESS_REGISTRANTS_ONLY,
1, 1, 0, 0); 1, 1, 0, 0);
} }
@@ -144,7 +142,7 @@ test_prout_reserve_access_earo(void)
void void
test_prout_reserve_access_wero(void) test_prout_reserve_access_wero(void)
{ {
verify_persistent_reserve(iscsic, tgt_lun, iscsic2, tgt_lun2, verify_persistent_reserve_access(iscsic, tgt_lun, iscsic2, tgt_lun2,
SCSI_PERSISTENT_RESERVE_TYPE_WRITE_EXCLUSIVE_REGISTRANTS_ONLY, SCSI_PERSISTENT_RESERVE_TYPE_WRITE_EXCLUSIVE_REGISTRANTS_ONLY,
1, 1, 1, 0); 1, 1, 1, 0);
} }
@@ -152,7 +150,7 @@ test_prout_reserve_access_wero(void)
void void
test_prout_reserve_access_eaar(void) test_prout_reserve_access_eaar(void)
{ {
verify_persistent_reserve(iscsic, tgt_lun, iscsic2, tgt_lun2, verify_persistent_reserve_access(iscsic, tgt_lun, iscsic2, tgt_lun2,
SCSI_PERSISTENT_RESERVE_TYPE_EXCLUSIVE_ACCESS_ALL_REGISTRANTS, SCSI_PERSISTENT_RESERVE_TYPE_EXCLUSIVE_ACCESS_ALL_REGISTRANTS,
1, 1, 0, 0); 1, 1, 0, 0);
} }
@@ -160,7 +158,7 @@ test_prout_reserve_access_eaar(void)
void void
test_prout_reserve_access_wear(void) test_prout_reserve_access_wear(void)
{ {
verify_persistent_reserve(iscsic, tgt_lun, iscsic2, tgt_lun2, verify_persistent_reserve_access(iscsic, tgt_lun, iscsic2, tgt_lun2,
SCSI_PERSISTENT_RESERVE_TYPE_WRITE_EXCLUSIVE_ALL_REGISTRANTS, SCSI_PERSISTENT_RESERVE_TYPE_WRITE_EXCLUSIVE_ALL_REGISTRANTS,
1, 1, 1, 0); 1, 1, 1, 0);
} }