md/bitmap: store bytes in file rather than just in last page.
This number is more generally useful, and bytes-in-last-page is
easily extracted from it.
Signed-off-by: NeilBrown <neilb@suse.de>
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index c98f2fe..7a3be0d 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -203,9 +203,13 @@
bdev = (rdev->meta_bdev) ? rdev->meta_bdev : rdev->bdev;
- if (page->index == store->file_pages-1)
- size = roundup(store->last_page_size,
+ if (page->index == store->file_pages-1) {
+ int last_page_size = store->bytes & (PAGE_SIZE-1);
+ if (last_page_size == 0)
+ last_page_size = PAGE_SIZE;
+ size = roundup(last_page_size,
bdev_logical_block_size(bdev));
+ }
/* Just make sure we aren't corrupting data or
* metadata
*/
@@ -973,6 +977,8 @@
if (!bitmap->mddev->bitmap_info.external)
bytes += sizeof(bitmap_super_t);
+ store->bytes = bytes;
+
num_pages = DIV_ROUND_UP(bytes, PAGE_SIZE);
if (file && i_size_read(file->f_mapping->host) < bytes) {
@@ -1042,8 +1048,6 @@
oldindex = index;
- store->last_page_size = count;
-
if (outofdate) {
/*
* if bitmap is out of date, dirty the
@@ -1965,9 +1969,7 @@
return -EINVAL;
if (mddev->bitmap &&
- sectors < ((mddev->bitmap->storage.file_pages - 1)
- * PAGE_SIZE
- + mddev->bitmap->storage.last_page_size + 511) >> 9)
+ sectors < (mddev->bitmap->storage.bytes + 511) >> 9)
return -EFBIG; /* Bitmap is too big for this small space */
/* could make sure it isn't too big, but that isn't really