1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/ieee1394/sbp2.h b/drivers/ieee1394/sbp2.h
index 34c52bf4fa34..abbe48e646c3 100644
--- a/drivers/ieee1394/sbp2.h
+++ b/drivers/ieee1394/sbp2.h
@@ -347,10 +347,17 @@ struct scsi_id_instance_data {
         /* Device specific workarounds/brokeness */
         unsigned workarounds;
 
-        atomic_t unfinished_reset;
+        atomic_t state;
         struct work_struct protocol_work;
 };
 
+/* For use in scsi_id_instance_data.state */
+enum sbp2lu_state_types {
+        SBP2LU_STATE_RUNNING,           /* all normal */
+        SBP2LU_STATE_IN_RESET,          /* between bus reset and reconnect */
+        SBP2LU_STATE_IN_SHUTDOWN        /* when sbp2_remove was called */
+};
+
 /* Sbp2 host data structure (one per IEEE1394 host) */
 struct sbp2scsi_host_info {
         struct hpsb_host *host;         /* IEEE1394 host */