md/bitmap: move some fields of 'struct bitmap' into a 'storage' substruct.

This new 'struct bitmap_storage' reflects the external storage of the
bitmap.
Having this clearly defined will make it easier to change the storage
used while the array is active.

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

1 files changed, 11 insertions, 6 deletions

diff --git a/drivers/md/bitmap.h b/drivers/md/bitmap.h
index 79e17983473a..162ab095b866 100644
--- a/drivers/md/bitmap.h
+++ b/drivers/md/bitmap.h
@@ -188,12 +188,17 @@ struct bitmap {
         /* bitmap spinlock */
         spinlock_t lock;
 
-        struct file *file; /* backing disk file */
-        struct page *sb_page; /* cached copy of the bitmap file superblock */
-        struct page **filemap; /* list of cache pages for the file */
-        unsigned long *filemap_attr; /* attributes associated w/ filemap pages */
-        unsigned long file_pages; /* number of pages in the file */
-        int last_page_size; /* bytes in the last page */
+        struct bitmap_storage {
+                struct file *file;              /* backing disk file */
+                struct page *sb_page;           /* cached copy of the bitmap
+                                                 * file superblock */
+                struct page **filemap;          /* list of cache pages for
+                                                 * the file */
+                unsigned long *filemap_attr;    /* attributes associated
+                                                 * w/ filemap pages */
+                unsigned long file_pages;       /* number of pages in the file*/
+                int last_page_size;             /* bytes in the last page */
+        } storage;
 
         unsigned long flags;