md: collect bitmap-specific fields into one structure.

In preparation for making bitmap fields configurable via sysfs,
start tidying up by making a single structure to contain the
configuration fields.

Signed-off-by: NeilBrown <neilb@suse.de>

1 files changed, 12 insertions, 10 deletions

diff --git a/drivers/md/md.h b/drivers/md/md.h
index cb036868a9e9..50e62ef32e9d 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -280,16 +280,18 @@ struct mddev_s
         unsigned int                    max_write_behind; /* 0 = sync */
 
         struct bitmap                   *bitmap; /* the bitmap for the device */
-        struct file                     *bitmap_file; /* the bitmap file */
-        long                            bitmap_offset; /* offset from superblock of
-                                                        * start of bitmap. May be
-                                                        * negative, but not '0'
-                                                        */
-        long                            default_bitmap_offset; /* this is the offset to use when
-                                                                * hot-adding a bitmap.  It should
-                                                                * eventually be settable by sysfs.
-                                                                */
-        struct mutex                    bitmap_mutex;
+        struct {
+                struct file             *file; /* the bitmap file */
+                long                    offset; /* offset from superblock of
+                                                 * start of bitmap. May be
+                                                 * negative, but not '0'
+                                                 */
+                long                    default_offset; /* this is the offset to use when
+                                                         * hot-adding a bitmap.  It should
+                                                         * eventually be settable by sysfs.
+                                                         */
+                struct mutex            mutex;
+        } bitmap_info;
 
         struct list_head                all_mddevs;