Merge tag 'driver-core-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-beck.git] / drivers / md / md.h

diff --git a/drivers/md/md.h b/drivers/md/md.h
index 2f5cc8a7ef3ed8e80d957ca48b5de5e775ce1ee7..07bba96de26047d3f4b868eefc78d3727f0be52d 100644 (file)
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -106,7 +106,7 @@ struct md_rdev {
                                           */
        struct work_struct del_work;    /* used for delayed sysfs removal */
 
-       struct sysfs_dirent *sysfs_state; /* handle for 'state'
+       struct kernfs_node *sysfs_state; /* handle for 'state'
                                           * sysfs entry */
 
        struct badblocks {
@@ -129,6 +129,9 @@ struct md_rdev {
 enum flag_bits {
        Faulty,                 /* device is known to have a fault */
        In_sync,                /* device is in_sync with rest of array */
+       Bitmap_sync,            /* ..actually, not quite In_sync.  Need a
+                                * bitmap-based recovery to get fully in sync
+                                */
        Unmerged,               /* device is being added to array and should
                                 * be considerred for bvec_merge_fn but not
                                 * yet for actual IO
@@ -376,10 +379,10 @@ struct mddev {
        sector_t                        resync_max;     /* resync should pause
                                                         * when it gets here */
 
-       struct sysfs_dirent             *sysfs_state;   /* handle for 'array_state'
+       struct kernfs_node              *sysfs_state;   /* handle for 'array_state'
                                                         * file in sysfs.
                                                         */
-       struct sysfs_dirent             *sysfs_action;  /* handle for 'sync_action' */
+       struct kernfs_node              *sysfs_action;  /* handle for 'sync_action' */
 
        struct work_struct del_work;    /* used for delayed sysfs removal */
 
@@ -498,13 +501,13 @@ struct md_sysfs_entry {
 };
 extern struct attribute_group md_bitmap_group;
 
-static inline struct sysfs_dirent *sysfs_get_dirent_safe(struct sysfs_dirent *sd, char *name)
+static inline struct kernfs_node *sysfs_get_dirent_safe(struct kernfs_node *sd, char *name)
 {
        if (sd)
                return sysfs_get_dirent(sd, name);
        return sd;
 }
-static inline void sysfs_notify_dirent_safe(struct sysfs_dirent *sd)
+static inline void sysfs_notify_dirent_safe(struct kernfs_node *sd)
 {
        if (sd)
                sysfs_notify_dirent(sd);