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

[karo-tx-linux.git] / drivers / md / bitmap.h

diff --git a/drivers/md/bitmap.h b/drivers/md/bitmap.h
index 79e17983473a3856f71504796e6c76fb122689a1..162ab095b866001d7589328197c43b6e87b9969c 100644 (file)
--- 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;