Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / include / linux / raid / md_k.h

diff --git a/include/linux/raid/md_k.h b/include/linux/raid/md_k.h
index c200b9a34affc193500897aead3eec14f98f5f5f..8fc909ef6787738b983b45243fc1786d4867fc2a 100644 (file)
--- a/include/linux/raid/md_k.h
+++ b/include/linux/raid/md_k.h
@@ -115,6 +115,9 @@ struct mdk_rdev_s
                                           * in superblock.
                                           */
        struct work_struct del_work;    /* used for delayed sysfs removal */
+
+       struct sysfs_dirent *sysfs_state; /* handle for 'state'
+                                          * sysfs entry */
 };
 
 struct mddev_s
@@ -128,7 +131,6 @@ struct mddev_s
 #define MD_CHANGE_DEVS 0       /* Some device status has changed */
 #define MD_CHANGE_CLEAN 1      /* transition to or from 'clean' */
 #define MD_CHANGE_PENDING 2    /* superblock update in progress */
-#define MD_NOTIFY_ARRAY_STATE 3        /* atomic context wants to notify userspace */
 
        int                             ro;
 
@@ -239,6 +241,10 @@ struct mddev_s
        sector_t                        resync_max;     /* resync should pause
                                                         * when it gets here */
 
+       struct sysfs_dirent             *sysfs_state;   /* handle for 'array_state'
+                                                        * file in sysfs.
+                                                        */
+
        spinlock_t                      write_lock;
        wait_queue_head_t               sb_wait;        /* for waiting on superblock updates */
        atomic_t                        pending_writes; /* number of active superblock writes */