xfs: remove inode log format typedef

Remove xfs_inode_log_format_t now that xfs_inode_log_format is
explicitly padded and therefore is a real on-disk structure.  This
enables xfs/122 to check the size of the structure.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h
index a7ab6adae7f68efc4018f4832e238b3d79073b18..996f035ee2058172899bd656c1259e9717bee85c 100644 (file)
--- a/fs/xfs/libxfs/xfs_log_format.h
+++ b/fs/xfs/libxfs/xfs_log_format.h
@@ -264,7 +264,7 @@ typedef struct xfs_trans_header {
  * (if any) is indicated in the ilf_dsize field.  Changes to this structure
  * must be added on to the end.
  */
-typedef struct xfs_inode_log_format {
+struct xfs_inode_log_format {
        uint16_t                ilf_type;       /* inode log item type */
        uint16_t                ilf_size;       /* size of this item */
        uint32_t                ilf_fields;     /* flags for fields logged */
@@ -279,7 +279,7 @@ typedef struct xfs_inode_log_format {
        int64_t                 ilf_blkno;      /* blkno of inode buffer */
        int32_t                 ilf_len;        /* len of inode buffer */
        int32_t                 ilf_boffset;    /* off of inode in buffer */
-} xfs_inode_log_format_t;
+};
 
 /*
  * Old 32 bit systems will log in this format without the 64 bit

diff --git a/fs/xfs/xfs_inode_item.h b/fs/xfs/xfs_inode_item.h
index 4c7722e325b369332d381c8435edfc33728a4067..b72373a33cd9d765d3bf4ad7c4f5e4012c0d056a 100644 (file)
--- a/fs/xfs/xfs_inode_item.h
+++ b/fs/xfs/xfs_inode_item.h
@@ -48,7 +48,7 @@ extern void xfs_iflush_done(struct xfs_buf *, struct xfs_log_item *);
 extern void xfs_istale_done(struct xfs_buf *, struct xfs_log_item *);
 extern void xfs_iflush_abort(struct xfs_inode *, bool);
 extern int xfs_inode_item_format_convert(xfs_log_iovec_t *,
-                                        xfs_inode_log_format_t *);
+                                        struct xfs_inode_log_format *);
 
 extern struct kmem_zone        *xfs_ili_zone;
 

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index f809deee53a899b6aa0db4311ed619bd04910d6f..6e0e38b5b7ad47b7a54c3537bd0f1a6f0f0f81ee 100644 (file)
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2985,7 +2985,7 @@ xlog_recover_inode_pass2(
        struct xlog_recover_item        *item,
        xfs_lsn_t                       current_lsn)
 {
-       xfs_inode_log_format_t  *in_f;
+       struct xfs_inode_log_format     *in_f;
        xfs_mount_t             *mp = log->l_mp;
        xfs_buf_t               *bp;
        xfs_dinode_t            *dip;
@@ -2999,10 +2999,10 @@ xlog_recover_inode_pass2(
        uint                    isize;
        int                     need_free = 0;
 
-       if (item->ri_buf[0].i_len == sizeof(xfs_inode_log_format_t)) {
+       if (item->ri_buf[0].i_len == sizeof(struct xfs_inode_log_format)) {
                in_f = item->ri_buf[0].i_addr;
        } else {
-               in_f = kmem_alloc(sizeof(xfs_inode_log_format_t), KM_SLEEP);
+               in_f = kmem_alloc(sizeof(struct xfs_inode_log_format), KM_SLEEP);
                need_free = 1;
                error = xfs_inode_item_format_convert(&item->ri_buf[0], in_f);
                if (error)
@@ -4299,7 +4299,7 @@ xlog_recover_add_to_trans(
        char                    *dp,
        int                     len)
 {
-       xfs_inode_log_format_t  *in_f;                  /* any will do */
+       struct xfs_inode_log_format     *in_f;                  /* any will do */
        xlog_recover_item_t     *item;
        char                    *ptr;
 
@@ -4333,7 +4333,7 @@ xlog_recover_add_to_trans(
 
        ptr = kmem_alloc(len, KM_SLEEP);
        memcpy(ptr, dp, len);
-       in_f = (xfs_inode_log_format_t *)ptr;
+       in_f = (struct xfs_inode_log_format *)ptr;
 
        /* take the tail entry */
        item = list_entry(trans->r_itemq.prev, xlog_recover_item_t, ri_list);