xfs: remove the dquot log format from the dquot log item

No need to keep the dquot log format around all the time, we can
easily generate it at iop_format time.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

2 files changed, 9 insertions, 17 deletions

diff --git a/fs/xfs/xfs_dquot_item.c b/fs/xfs/xfs_dquot_item.c
index 946d588070b0..d4fffa90036a 100644
--- a/fs/xfs/xfs_dquot_item.c
+++ b/fs/xfs/xfs_dquot_item.c
@@ -61,12 +61,17 @@ xfs_qm_dquot_logitem_format(
 {
         struct xfs_dq_logitem   *qlip = DQUOT_ITEM(lip);
         struct xfs_log_iovec    *vecp = NULL;
+        struct xfs_dq_logformat *qlf;
 
-        qlip->qli_format.qlf_size = 2;
+        qlf = xlog_prepare_iovec(lv, &vecp, XLOG_REG_TYPE_QFORMAT);
+        qlf->qlf_type = XFS_LI_DQUOT;
+        qlf->qlf_size = 2;
+        qlf->qlf_id = be32_to_cpu(qlip->qli_dquot->q_core.d_id);
+        qlf->qlf_blkno = qlip->qli_dquot->q_blkno;
+        qlf->qlf_len = 1;
+        qlf->qlf_boffset = qlip->qli_dquot->q_bufoffset;
+        xlog_finish_iovec(lv, vecp, sizeof(struct xfs_dq_logformat));
 
-        xlog_copy_iovec(lv, &vecp, XLOG_REG_TYPE_QFORMAT,
-                        &qlip->qli_format,
-                        sizeof(struct xfs_dq_logformat));
         xlog_copy_iovec(lv, &vecp, XLOG_REG_TYPE_DQUOT,
                         &qlip->qli_dquot->q_core,
                         sizeof(struct xfs_disk_dquot));
@@ -256,18 +261,6 @@ xfs_qm_dquot_logitem_init(
         xfs_log_item_init(dqp->q_mount, &lp->qli_item, XFS_LI_DQUOT,
                                         &xfs_dquot_item_ops);
         lp->qli_dquot = dqp;
-        lp->qli_format.qlf_type = XFS_LI_DQUOT;
-        lp->qli_format.qlf_id = be32_to_cpu(dqp->q_core.d_id);
-        lp->qli_format.qlf_blkno = dqp->q_blkno;
-        lp->qli_format.qlf_len = 1;
-        /*
-         * This is just the offset of this dquot within its buffer
-         * (which is currently 1 FSB and probably won't change).
-         * Hence 32 bits for this offset should be just fine.
-         * Alternatively, we can store (bufoffset / sizeof(xfs_dqblk_t))
-         * here, and recompute it at recovery time.
-         */
-        lp->qli_format.qlf_boffset = (__uint32_t)dqp->q_bufoffset;
 }
 
 /*------------------  QUOTAOFF LOG ITEMS  -------------------*/
diff --git a/fs/xfs/xfs_dquot_item.h b/fs/xfs/xfs_dquot_item.h
index 5acae2ada70b..925cbe948c67 100644
--- a/fs/xfs/xfs_dquot_item.h
+++ b/fs/xfs/xfs_dquot_item.h
@@ -27,7 +27,6 @@ typedef struct xfs_dq_logitem {
         xfs_log_item_t           qli_item;         /* common portion */
         struct xfs_dquot        *qli_dquot;        /* dquot ptr */
         xfs_lsn_t                qli_flush_lsn;    /* lsn at last flush */
-        xfs_dq_logformat_t       qli_format;       /* logged structure */
 } xfs_dq_logitem_t;
 
 typedef struct xfs_qoff_logitem {