From 8e1332d70a72037e2b9751bbe14f95c8fb3efa71 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Tue, 15 Dec 2015 21:09:42 -0800 Subject: [PATCH] Change ISCSI_STATUS_* to SCSI_STATUS_* We unified ISCSI and SCSI status codes a long long time ago and got rid of the actual ISCSI_STATUS_* codes. Update iscsi.h and remove references to these obsolete symbols and replace with SCSI_STATUS_* --- include/iscsi.h | 78 ++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/include/iscsi.h b/include/iscsi.h index 923e2ab..1bfd147 100644 --- a/include/iscsi.h +++ b/include/iscsi.h @@ -231,7 +231,7 @@ EXTERN struct iscsi_context *iscsi_create_context(const char *initiator_name); /* * Destroy an existing ISCSI context and tear down any existing connection. * Callbacks for any command in flight will be invoked with - * ISCSI_STATUS_CANCELLED. + * SCSI_STATUS_CANCELLED. * * Returns: * 0: success @@ -369,13 +369,13 @@ typedef void (*iscsi_command_cb)(struct iscsi_context *iscsi, int status, * * Callback parameters : * status can be either of : - * ISCSI_STATUS_GOOD : Connection was successful. Command_data is NULL. - * In this case the callback will be invoked a - * second time once the connection is torn down. + * SCSI_STATUS_GOOD : Connection was successful. Command_data is NULL. + * In this case the callback will be invoked a + * second time once the connection is torn down. * - * ISCSI_STATUS_ERROR : Either failed to establish the connection, or - * an already established connection has failed - * with an error. + * SCSI_STATUS_ERROR : Either failed to establish the connection, or + * an already established connection has failed + * with an error. * * The callback will NOT be invoked if the session is explicitely torn down * through a call to iscsi_disconnect() or iscsi_destroy_context(). @@ -408,13 +408,13 @@ EXTERN int iscsi_connect_sync(struct iscsi_context *iscsi, const char *portal); * * Callback parameters : * status can be either of : - * ISCSI_STATUS_GOOD : Connection was successful. Command_data is NULL. - * In this case the callback will be invoked a - * second time once the connection is torn down. + * SCSI_STATUS_GOOD : Connection was successful. Command_data is NULL. + * In this case the callback will be invoked a + * second time once the connection is torn down. * - * ISCSI_STATUS_ERROR : Either failed to establish the connection, or - * an already established connection has failed - * with an error. + * SCSI_STATUS_ERROR : Either failed to establish the connection, or + * an already established connection has failed + * with an error. * * The callback will NOT be invoked if the session is explicitely torn down * through a call to iscsi_disconnect() or iscsi_destroy_context(). @@ -476,10 +476,10 @@ EXTERN int iscsi_reconnect_sync(struct iscsi_context *iscsi); * * Callback parameters : * status can be either of : - * ISCSI_STATUS_GOOD : login was successful. Command_data is always - * NULL. - * ISCSI_STATUS_CANCELLED: login was aborted. Command_data is NULL. - * ISCSI_STATUS_ERROR : login failed. Command_data is NULL. + * SCSI_STATUS_GOOD : login was successful. Command_data is always + * NULL. + * SCSI_STATUS_CANCELLED: login was aborted. Command_data is NULL. + * SCSI_STATUS_ERROR : login failed. Command_data is NULL. */ EXTERN int iscsi_login_async(struct iscsi_context *iscsi, iscsi_command_cb cb, void *private_data); @@ -504,9 +504,9 @@ EXTERN int iscsi_login_sync(struct iscsi_context *iscsi); * * Callback parameters : * status can be either of : - * ISCSI_STATUS_GOOD : logout was successful. Command_data is always - * NULL. - * ISCSI_STATUS_CANCELLED: logout was aborted. Command_data is NULL. + * SCSI_STATUS_GOOD : logout was successful. Command_data is always + * NULL. + * SCSI_STATUS_CANCELLED: logout was aborted. Command_data is NULL. */ EXTERN int iscsi_logout_async(struct iscsi_context *iscsi, iscsi_command_cb cb, void *private_data); @@ -533,13 +533,13 @@ EXTERN int iscsi_logout_sync(struct iscsi_context *iscsi); * * Callback parameters : * status can be either of : - * ISCSI_STATUS_GOOD : Discovery was successful. Command_data is a - * pointer to a iscsi_discovery_address list of - * structures. - * This list of structures is only valid for the - * duration of the callback and all data will be - * freed once the callback returns. - * ISCSI_STATUS_CANCELLED: Discovery was aborted. Command_data is NULL. + * SCSI_STATUS_GOOD : Discovery was successful. Command_data is a + * pointer to a iscsi_discovery_address list of + * structures. + * This list of structures is only valid for the + * duration of the callback and all data will be + * freed once the callback returns. + * SCSI_STATUS_CANCELLED : Discovery was aborted. Command_data is NULL. */ EXTERN int iscsi_discovery_async(struct iscsi_context *iscsi, iscsi_command_cb cb, void *private_data); @@ -565,11 +565,11 @@ struct iscsi_discovery_address { * * Callback parameters : * status can be either of : - * ISCSI_STATUS_GOOD : NOP-OUT was successful and the server responded - * with a NOP-IN callback_data is a iscsi_data - * structure containing the data returned from - * the server. - * ISCSI_STATUS_CANCELLED: Discovery was aborted. Command_data is NULL. + * SCSI_STATUS_GOOD : NOP-OUT was successful and the server responded + * with a NOP-IN callback_data is a iscsi_data + * structure containing the data returned from + * the server. + * SCSI_STATUS_CANCELLED : Discovery was aborted. Command_data is NULL. * * The callback may be NULL if you only want to let libiscsi count the in-flight * NOPs. @@ -605,10 +605,10 @@ enum iscsi_task_mgmt_funcs { * * Callback parameters : * status can be either of : - * ISCSI_STATUS_GOOD : Connection was successful. Command_data is a pointer to uint32_t - * containing the response code as per RFC3720/10.6.1 + * SCSI_STATUS_GOOD : Connection was successful. Command_data is a pointer to uint32_t + * containing the response code as per RFC3720/10.6.1 * - * ISCSI_STATUS_ERROR : Error. + * SCSI_STATUS_ERROR : Error. * * The callback will NOT be invoked if the session is explicitely torn down * through a call to iscsi_disconnect() or iscsi_destroy_context(). @@ -679,19 +679,19 @@ iscsi_task_mgmt_target_cold_reset_sync(struct iscsi_context *iscsi); * The content of command_data depends on the status type. * * status : - * ISCSI_STATUS_GOOD the scsi command completed successfullt on the target. + * SCSI_STATUS_GOOD the scsi command completed successfullt on the target. * If this scsi command returns DATA-IN, that data is stored in an scsi_task * structure returned in the command_data parameter. This buffer will be * automatically freed once the callback returns. * - * ISCSI_STATUS_CHECK_CONDITION the scsi command failed with a scsi sense. + * SCSI_STATUS_CHECK_CONDITION the scsi command failed with a scsi sense. * Command_data contains a struct scsi_task. When the callback returns, * this buffer will automatically become freed. * - * ISCSI_STATUS_CANCELLED the scsi command was aborted. Command_data is + * SCSI_STATUS_CANCELLED the scsi command was aborted. Command_data is * NULL. * - * ISCSI_STATUS_ERROR the command failed. Command_data is NULL. + * SCSI_STATUS_ERROR the command failed. Command_data is NULL. */ struct iscsi_data {