5 files changed, 40 insertions, 43 deletions

diff --git a/fs/xfs/xfs_alloc_btree.h b/fs/xfs/xfs_alloc_btree.h
index a6caa0022c9b..359fb86ed876 100644
--- a/fs/xfs/xfs_alloc_btree.h
+++ b/fs/xfs/xfs_alloc_btree.h
@@ -51,20 +51,6 @@ typedef struct xfs_alloc_rec_incore {
 typedef __be32 xfs_alloc_ptr_t;
 
 /*
- * Minimum and maximum blocksize and sectorsize.
- * The blocksize upper limit is pretty much arbitrary.
- * The sectorsize upper limit is due to sizeof(sb_sectsize).
- */
-#define XFS_MIN_BLOCKSIZE_LOG   9       /* i.e. 512 bytes */
-#define XFS_MAX_BLOCKSIZE_LOG   16      /* i.e. 65536 bytes */
-#define XFS_MIN_BLOCKSIZE       (1 << XFS_MIN_BLOCKSIZE_LOG)
-#define XFS_MAX_BLOCKSIZE       (1 << XFS_MAX_BLOCKSIZE_LOG)
-#define XFS_MIN_SECTORSIZE_LOG  9       /* i.e. 512 bytes */
-#define XFS_MAX_SECTORSIZE_LOG  15      /* i.e. 32768 bytes */
-#define XFS_MIN_SECTORSIZE      (1 << XFS_MIN_SECTORSIZE_LOG)
-#define XFS_MAX_SECTORSIZE      (1 << XFS_MAX_SECTORSIZE_LOG)
-
-/*
  * Block numbers in the AG:
  * SB is sector 0, AGF is sector 1, AGI is sector 2, AGFL is sector 3.
  */
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
index 45df2b857d48..52cd8f89ee72 100644
--- a/fs/xfs/xfs_buf_item.c
+++ b/fs/xfs/xfs_buf_item.c
@@ -240,15 +240,13 @@ xfs_buf_item_format(
                (bip->bli_flags & XFS_BLI_STALE));
 
         /*
-         * The size of the base structure is the size of the
-         * declared structure plus the space for the extra words
-         * of the bitmap.  We subtract one from the map size, because
-         * the first element of the bitmap is accounted for in the
-         * size of the base structure.
+         * Base size is the actual size of the ondisk structure - it reflects
+         * the actual size of the dirty bitmap rather than the size of the in
+         * memory structure.
          */
-        base_size =
-                (uint)(sizeof(xfs_buf_log_format_t) +
-                       ((bip->bli_format.blf_map_size - 1) * sizeof(uint)));
+        base_size = offsetof(struct xfs_buf_log_format, blf_data_map) +
+                        (bip->bli_format.blf_map_size *
+                                sizeof(bip->bli_format.blf_data_map[0]));
         vecp->i_addr = &bip->bli_format;
         vecp->i_len = base_size;
         vecp->i_type = XLOG_REG_TYPE_BFORMAT;
diff --git a/fs/xfs/xfs_buf_item.h b/fs/xfs/xfs_buf_item.h
index b6ecd2061e7c..ff2686780239 100644
--- a/fs/xfs/xfs_buf_item.h
+++ b/fs/xfs/xfs_buf_item.h
@@ -21,23 +21,6 @@
 extern kmem_zone_t      *xfs_buf_item_zone;
 
 /*
- * This is the structure used to lay out a buf log item in the
- * log.  The data map describes which 128 byte chunks of the buffer
- * have been logged.
- * For 6.2 and beyond, this is XFS_LI_BUF.  We use this to log everything.
- */
-typedef struct xfs_buf_log_format {
-        unsigned short  blf_type;       /* buf log item type indicator */
-        unsigned short  blf_size;       /* size of this item */
-        ushort          blf_flags;      /* misc state */
-        ushort          blf_len;        /* number of blocks in this buf */
-        __int64_t       blf_blkno;      /* starting blkno of this buf */
-        unsigned int    blf_map_size;   /* size of data bitmap in words */
-        unsigned int    blf_data_map[1];/* variable size bitmap of */
-                                        /*   regions of buffer in this item */
-} xfs_buf_log_format_t;
-
-/*
  * This flag indicates that the buffer contains on disk inodes
  * and requires special recovery handling.
  */
@@ -61,6 +44,23 @@ typedef struct xfs_buf_log_format {
 #define NBWORD                  (NBBY * sizeof(unsigned int))
 
 /*
+ * This is the structure used to lay out a buf log item in the
+ * log.  The data map describes which 128 byte chunks of the buffer
+ * have been logged.
+ */
+#define XFS_BLF_DATAMAP_SIZE    ((XFS_MAX_BLOCKSIZE / XFS_BLF_CHUNK) / NBWORD)
+
+typedef struct xfs_buf_log_format {
+        unsigned short  blf_type;       /* buf log item type indicator */
+        unsigned short  blf_size;       /* size of this item */
+        ushort          blf_flags;      /* misc state */
+        ushort          blf_len;        /* number of blocks in this buf */
+        __int64_t       blf_blkno;      /* starting blkno of this buf */
+        unsigned int    blf_map_size;   /* used size of data bitmap in words */
+        unsigned int    blf_data_map[XFS_BLF_DATAMAP_SIZE]; /* dirty bitmap */
+} xfs_buf_log_format_t;
+
+/*
  * buf log item flags
  */
 #define XFS_BLI_HOLD            0x01
@@ -102,7 +102,7 @@ typedef struct xfs_buf_log_item {
         char                    *bli_orig;      /* original buffer copy */
         char                    *bli_logged;    /* bytes logged (bitmap) */
 #endif
-        xfs_buf_log_format_t    bli_format;     /* in-log header */
+        struct xfs_buf_log_format bli_format;   /* embedded in-log header */
 } xfs_buf_log_item_t;
 
 void    xfs_buf_item_init(struct xfs_buf *, struct xfs_mount *);
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 0d9de41a7151..425f6e9d4c0c 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1514,9 +1514,8 @@ xfs_init_zones(void)
          * size possible under XFS.  This wastes a little bit of memory,
          * but it is much faster.
          */
-        xfs_buf_item_zone = kmem_zone_init((sizeof(xfs_buf_log_item_t) +
-                                (((XFS_MAX_BLOCKSIZE / XFS_BLF_CHUNK) /
-                                  NBWORD) * sizeof(int))), "xfs_buf_item");
+        xfs_buf_item_zone = kmem_zone_init(sizeof(struct xfs_buf_log_item),
+                                           "xfs_buf_item");
         if (!xfs_buf_item_zone)
                 goto out_destroy_log_item_desc_zone;
 
diff --git a/fs/xfs/xfs_types.h b/fs/xfs/xfs_types.h
index 398cf681d025..7a41874f4c20 100644
--- a/fs/xfs/xfs_types.h
+++ b/fs/xfs/xfs_types.h
@@ -133,6 +133,20 @@ typedef __uint64_t	xfs_filblks_t;	/* number of blocks in a file */
 #define MAXAEXTNUM      ((xfs_aextnum_t)0x7fff)         /* signed short */
 
 /*
+ * Minimum and maximum blocksize and sectorsize.
+ * The blocksize upper limit is pretty much arbitrary.
+ * The sectorsize upper limit is due to sizeof(sb_sectsize).
+ */
+#define XFS_MIN_BLOCKSIZE_LOG   9       /* i.e. 512 bytes */
+#define XFS_MAX_BLOCKSIZE_LOG   16      /* i.e. 65536 bytes */
+#define XFS_MIN_BLOCKSIZE       (1 << XFS_MIN_BLOCKSIZE_LOG)
+#define XFS_MAX_BLOCKSIZE       (1 << XFS_MAX_BLOCKSIZE_LOG)
+#define XFS_MIN_SECTORSIZE_LOG  9       /* i.e. 512 bytes */
+#define XFS_MAX_SECTORSIZE_LOG  15      /* i.e. 32768 bytes */
+#define XFS_MIN_SECTORSIZE      (1 << XFS_MIN_SECTORSIZE_LOG)
+#define XFS_MAX_SECTORSIZE      (1 << XFS_MAX_SECTORSIZE_LOG)
+
+/*
  * Min numbers of data/attr fork btree root pointers.
  */
 #define MINDBTPTRS      3