sony-laptop: generalise ACPI calls into SNC functions

[mirror_ubuntu-bionic-kernel.git] / drivers / md / bitmap.h

diff --git a/drivers/md/bitmap.h b/drivers/md/bitmap.h
index b44b0aba2d47b970f9b76f39763192995e5984fb..df4aeb6ac6f04ea0c30b9e28812fc64c8c3646a0 100644 (file)
--- a/drivers/md/bitmap.h
+++ b/drivers/md/bitmap.h
@@ -111,9 +111,9 @@ typedef __u16 bitmap_counter_t;
 
 /* use these for bitmap->flags and bitmap->sb->state bit-fields */
 enum bitmap_state {
-       BITMAP_STALE  = 0x002,  /* the bitmap file is out of date or had -EIO */
-       BITMAP_WRITE_ERROR = 0x004, /* A write error has occurred */
-       BITMAP_HOSTENDIAN = 0x8000,
+       BITMAP_STALE       = 1,  /* the bitmap file is out of date or had -EIO */
+       BITMAP_WRITE_ERROR = 2, /* A write error has occurred */
+       BITMAP_HOSTENDIAN  =15,
 };
 
 /* the superblock at the front of the bitmap file -- little endian */
@@ -128,8 +128,10 @@ typedef struct bitmap_super_s {
        __le32 chunksize;    /* 52  the bitmap chunk size in bytes */
        __le32 daemon_sleep; /* 56  seconds between disk flushes */
        __le32 write_behind; /* 60  number of outstanding write-behind writes */
+       __le32 sectors_reserved; /* 64 number of 512-byte sectors that are
+                                 * reserved for the bitmap. */
 
-       __u8  pad[256 - 64]; /* set to zero */
+       __u8  pad[256 - 68]; /* set to zero */
 } bitmap_super_t;
 
 /* notes:
@@ -159,36 +161,49 @@ struct bitmap_page {
         * pointer and use it as two counters itself
         */
        unsigned int hijacked:1;
+       /*
+        * If any counter in this page is '1' or '2' - and so could be
+        * cleared then that page is marked as 'pending'
+        */
+       unsigned int pending:1;
        /*
         * count of dirty bits on the page
         */
-       unsigned int  count:31;
+       unsigned int  count:30;
 };
 
 /* the main bitmap structure - one per mddev */
 struct bitmap {
-       struct bitmap_page *bp;
-       unsigned long pages; /* total number of pages in the bitmap */
-       unsigned long missing_pages; /* number of pages not yet allocated */
 
-       struct mddev *mddev; /* the md device that the bitmap is for */
+       struct bitmap_counts {
+               spinlock_t lock;
+               struct bitmap_page *bp;
+               unsigned long pages;            /* total number of pages
+                                                * in the bitmap */
+               unsigned long missing_pages;    /* number of pages
+                                                * not yet allocated */
+               unsigned long chunkshift;       /* chunksize = 2^chunkshift
+                                                * (for bitops) */
+               unsigned long chunks;           /* Total number of data
+                                                * chunks for the array */
+       } counts;
 
-       /* bitmap chunksize -- how much data does each bit represent? */
-       unsigned long chunkshift; /* chunksize = 2^(chunkshift+9) (for bitops) */
-       unsigned long chunks; /* total number of data chunks for the array */
+       struct mddev *mddev; /* the md device that the bitmap is for */
 
        __u64   events_cleared;
        int need_sync;
 
-       /* 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*/
+               unsigned long bytes;            /* total bytes in the bitmap */
+       } storage;
 
        unsigned long flags;
 
@@ -242,6 +257,9 @@ void bitmap_cond_end_sync(struct bitmap *bitmap, sector_t sector);
 
 void bitmap_unplug(struct bitmap *bitmap);
 void bitmap_daemon_work(struct mddev *mddev);
+
+int bitmap_resize(struct bitmap *bitmap, sector_t blocks,
+                 int chunksize, int init);
 #endif
 
 #endif