xfs: introduce v5 inode group structure

Introduce a new "v5" inode group structure that fixes the alignment
and padding problems of the existing structure.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>

diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h
index 132e364eb141e612abbc888e83ca580ef4860637..8b8fe78511fbdbf0a0609f37095b1a058f41388c 100644 (file)
--- a/fs/xfs/libxfs/xfs_fs.h
+++ b/fs/xfs/libxfs/xfs_fs.h
@@ -445,6 +445,17 @@ struct xfs_inogrp {
        __u64           xi_allocmask;   /* mask of allocated inodes     */
 };
 
+/* New inumbers structure that reports v5 features and fixes padding issues */
+struct xfs_inumbers {
+       uint64_t        xi_startino;    /* starting inode number        */
+       uint64_t        xi_allocmask;   /* mask of allocated inodes     */
+       uint8_t         xi_alloccount;  /* # bits set in allocmask      */
+       uint8_t         xi_version;     /* version                      */
+       uint8_t         xi_padding[6];  /* zero                         */
+};
+
+#define XFS_INUMBERS_VERSION_V1        (1)
+#define XFS_INUMBERS_VERSION_V5        (5)
 
 /*
  * Error injection.

diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 9f1984c31ba267b590750eefdab9439feb7a2a3d..cdec674371a8b3c78ebc9c3cc8f154812724cd5d 100644 (file)
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -729,10 +729,13 @@ xfs_fsbulkstat_one_fmt(
 
 int
 xfs_fsinumbers_fmt(
-       struct xfs_ibulk        *breq,
-       const struct xfs_inogrp *igrp)
+       struct xfs_ibulk                *breq,
+       const struct xfs_inumbers       *igrp)
 {
-       if (copy_to_user(breq->ubuffer, igrp, sizeof(*igrp)))
+       struct xfs_inogrp               ig1;
+
+       xfs_inumbers_to_inogrp(&ig1, igrp);
+       if (copy_to_user(breq->ubuffer, &ig1, sizeof(struct xfs_inogrp)))
                return -EFAULT;
        return xfs_ibulk_advance(breq, sizeof(struct xfs_inogrp));
 }

diff --git a/fs/xfs/xfs_ioctl.h b/fs/xfs/xfs_ioctl.h
index 514d3028a1347df0b2b7a0085c8138de3e9b9ee5..654c0bb1bcf8981c1f863ec315a409c0906365c3 100644 (file)
--- a/fs/xfs/xfs_ioctl.h
+++ b/fs/xfs/xfs_ioctl.h
@@ -83,6 +83,6 @@ struct xfs_inogrp;
 
 int xfs_fsbulkstat_one_fmt(struct xfs_ibulk *breq,
                           const struct xfs_bulkstat *bstat);
-int xfs_fsinumbers_fmt(struct xfs_ibulk *breq, const struct xfs_inogrp *igrp);
+int xfs_fsinumbers_fmt(struct xfs_ibulk *breq, const struct xfs_inumbers *igrp);
 
 #endif

diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
index ed8e012dabbbe1190164d8bb0234780d9a06753e..ca734381a557da13ced96a4628af7873c51383f0 100644 (file)
--- a/fs/xfs/xfs_ioctl32.c
+++ b/fs/xfs/xfs_ioctl32.c
@@ -81,10 +81,14 @@ xfs_compat_growfs_rt_copyin(
 
 STATIC int
 xfs_fsinumbers_fmt_compat(
-       struct xfs_ibulk        *breq,
-       const struct xfs_inogrp *igrp)
+       struct xfs_ibulk                *breq,
+       const struct xfs_inumbers       *ig)
 {
-       struct compat_xfs_inogrp __user *p32 = breq->ubuffer;
+       struct compat_xfs_inogrp __user *p32 = breq->ubuffer;
+       struct xfs_inogrp               ig1;
+       struct xfs_inogrp               *igrp = &ig1;
+
+       xfs_inumbers_to_inogrp(&ig1, ig);
 
        if (put_user(igrp->xi_startino,   &p32->xi_startino) ||
            put_user(igrp->xi_alloccount, &p32->xi_alloccount) ||

diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index 5d406915144d278baa63521933a6fe7dd5cc9263..687c873fa6356aaf42d0b810722d7414d7edff18 100644 (file)
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -331,10 +331,11 @@ xfs_inumbers_walk(
        const struct xfs_inobt_rec_incore *irec,
        void                    *data)
 {
-       struct xfs_inogrp       inogrp = {
+       struct xfs_inumbers     inogrp = {
                .xi_startino    = XFS_AGINO_TO_INO(mp, agno, irec->ir_startino),
                .xi_alloccount  = irec->ir_count - irec->ir_freecount,
                .xi_allocmask   = ~irec->ir_free,
+               .xi_version     = XFS_INUMBERS_VERSION_V5,
        };
        struct xfs_inumbers_chunk *ic = data;
        xfs_agino_t             agino;
@@ -381,3 +382,14 @@ xfs_inumbers(
 
        return error;
 }
+
+/* Convert an inumbers (v5) struct to a inogrp (v1) struct. */
+void
+xfs_inumbers_to_inogrp(
+       struct xfs_inogrp               *ig1,
+       const struct xfs_inumbers       *ig)
+{
+       ig1->xi_startino = ig->xi_startino;
+       ig1->xi_alloccount = ig->xi_alloccount;
+       ig1->xi_allocmask = ig->xi_allocmask;
+}

diff --git a/fs/xfs/xfs_itable.h b/fs/xfs/xfs_itable.h
index 60e2591920568ac8a6eb5662ffbf5f2228470066..fa9fb9104c7f044a6f06d782e82ca2d97f7d3d42 100644 (file)
--- a/fs/xfs/xfs_itable.h
+++ b/fs/xfs/xfs_itable.h
@@ -46,8 +46,10 @@ void xfs_bulkstat_to_bstat(struct xfs_mount *mp, struct xfs_bstat *bs1,
                const struct xfs_bulkstat *bstat);
 
 typedef int (*inumbers_fmt_pf)(struct xfs_ibulk *breq,
-               const struct xfs_inogrp *igrp);
+               const struct xfs_inumbers *igrp);
 
 int xfs_inumbers(struct xfs_ibulk *breq, inumbers_fmt_pf formatter);
+void xfs_inumbers_to_inogrp(struct xfs_inogrp *ig1,
+               const struct xfs_inumbers *ig);
 
 #endif /* __XFS_ITABLE_H__ */

diff --git a/fs/xfs/xfs_ondisk.h b/fs/xfs/xfs_ondisk.h
index 0b4cdda68524c75ef53d930eea861eaae7d459ee..d8f941b4d51c6daa414844f0f15c32139d9fd573 100644 (file)
--- a/fs/xfs/xfs_ondisk.h
+++ b/fs/xfs/xfs_ondisk.h
@@ -148,6 +148,7 @@ xfs_check_ondisk_structs(void)
        XFS_CHECK_OFFSET(struct xfs_attr3_leafblock, hdr.info.hdr, 0);
 
        XFS_CHECK_STRUCT_SIZE(struct xfs_bulkstat,              192);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_inumbers,              24);
 }
 
 #endif /* __XFS_ONDISK_H */