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

Merge remote branch 'gonzoleeman/master'

Browse Source
This commit is contained in:
Ronnie Sahlberg
2012-12-26 05:44:36 -08:00
parent 61ad9b1972 d72e6b3717
commit eb2a586cc4
6 changed files with 59 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test-tool/iscsi-test.h
View File

@@ -231,13 +231,6 @@ static inline int pr_type_is_all_registrants(
}
}
struct resvn_type_info {
const char *pr_type_str;
enum scsi_persistent_out_type pr_type;
};
extern struct resvn_type_info reservation_types[];
int register_and_ignore(struct iscsi_context *iscsi, int lun,
unsigned long long key);
int register_key(struct iscsi_context *iscsi, int lun,
@@ -247,11 +240,11 @@ int verify_key_presence(struct iscsi_context *iscsi, int lun,
int reregister_key_fails(struct iscsi_context *iscsi, int lun,
unsigned long long sark);
int reserve(struct iscsi_context *iscsi, int lun,
unsigned long long key, struct resvn_type_info *rtip);
unsigned long long key, enum scsi_persistent_out_type pr_type);
int release(struct iscsi_context *iscsi, int lun,
unsigned long long key, struct resvn_type_info *rtip);
unsigned long long key, enum scsi_persistent_out_type pr_type);
int verify_reserved_as(struct iscsi_context *iscsi, int lun,
unsigned long long key, struct resvn_type_info *rtip);
unsigned long long key, enum scsi_persistent_out_type pr_type);
int testunitready(struct iscsi_context *iscsi, int lun);
int testunitready_nomedium(struct iscsi_context *iscsi, int lun);
int testunitready_conflict(struct iscsi_context *iscsi, int lun);
@@ -270,5 +263,4 @@ int verify12_nomedium(struct iscsi_context *iscsi, int lun, unsigned char *data,
int verify12_miscompare(struct iscsi_context *iscsi, int lun, unsigned char *data, uint32_t datalen, uint32_t lba, int vprotect, int dpo, int bytchk, int blocksize);
int verify12_lbaoutofrange(struct iscsi_context *iscsi, int lun, unsigned char *data, uint32_t datalen, uint32_t lba, int vprotect, int dpo, int bytchk, int blocksize);
#endif /* _ISCSI_TEST_H_ */