Put the members that need to be protected by the state_lock
together.

Signed-off-by: Robert Love <[EMAIL PROTECTED]>
---

 include/scsi/libfc/libfc.h |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/scsi/libfc/libfc.h b/include/scsi/libfc/libfc.h
index e4e7899..8af6e56 100644
--- a/include/scsi/libfc/libfc.h
+++ b/include/scsi/libfc/libfc.h
@@ -408,7 +408,6 @@ struct fc_lport {
        /* Operational Information */
        struct libfc_function_template tt;
        u16                     link_status;
-       enum fc_lport_state     state;
        unsigned long           boot_time;
 
        struct fc_host_statistics host_stats;
@@ -416,7 +415,6 @@ struct fc_lport {
 
        u64                     wwpn;
        u64                     wwnn;
-       u32                     fid;
        u8                      retry_count;
        unsigned char           ns_disc_retry_count;
        unsigned char           ns_disc_delay;
@@ -439,6 +437,10 @@ struct fc_lport {
        /* Locks */
        spinlock_t              state_lock;     /* serializes state changes */
 
+       /* Members protected by the state_lock */
+       u32                     fid;
+       enum fc_lport_state     state;
+
        /* Miscellaneous */
        struct fc_gpn_ft_resp   ns_disc_buf;    /* partial name buffer */
        struct timer_list       state_timer;    /* timer for state events */

_______________________________________________
devel mailing list
[email protected]
http://www.open-fcoe.org/mailman/listinfo/devel

Reply via email to