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

This one doesn't save a whole lot of memory, but still makes the
code simpler.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Christoph Hellwig 2013-12-13 11:34:08 +11:00 committed by Dave Chinner
parent ce8e962939
commit ffda4e83aa
2 changed files with 8 additions and 16 deletions

View File

@ -286,13 +286,6 @@ xfs_qm_qoff_logitem_size(
*nbytes += sizeof(struct xfs_qoff_logitem); *nbytes += sizeof(struct xfs_qoff_logitem);
} }
/*
* This is called to fill in the vector of log iovecs for the
* given quotaoff log item. We use only 1 iovec, and we point that
* at the quotaoff_log_format structure embedded in the quotaoff item.
* It is at this point that we assert that all of the extent
* slots in the quotaoff item have been filled.
*/
STATIC void STATIC void
xfs_qm_qoff_logitem_format( xfs_qm_qoff_logitem_format(
struct xfs_log_item *lip, struct xfs_log_item *lip,
@ -300,13 +293,13 @@ xfs_qm_qoff_logitem_format(
{ {
struct xfs_qoff_logitem *qflip = QOFF_ITEM(lip); struct xfs_qoff_logitem *qflip = QOFF_ITEM(lip);
struct xfs_log_iovec *vecp = NULL; struct xfs_log_iovec *vecp = NULL;
struct xfs_qoff_logformat *qlf;
ASSERT(qflip->qql_format.qf_type == XFS_LI_QUOTAOFF); qlf = xlog_prepare_iovec(lv, &vecp, XLOG_REG_TYPE_QUOTAOFF);
qflip->qql_format.qf_size = 1; qlf->qf_type = XFS_LI_QUOTAOFF;
qlf->qf_size = 1;
xlog_copy_iovec(lv, &vecp, XLOG_REG_TYPE_QUOTAOFF, qlf->qf_flags = qflip->qql_flags;
&qflip->qql_format, xlog_finish_iovec(lv, vecp, sizeof(struct xfs_qoff_logitem));
sizeof(struct xfs_qoff_logitem));
} }
/* /*
@ -446,8 +439,7 @@ xfs_qm_qoff_logitem_init(
xfs_log_item_init(mp, &qf->qql_item, XFS_LI_QUOTAOFF, start ? xfs_log_item_init(mp, &qf->qql_item, XFS_LI_QUOTAOFF, start ?
&xfs_qm_qoffend_logitem_ops : &xfs_qm_qoff_logitem_ops); &xfs_qm_qoffend_logitem_ops : &xfs_qm_qoff_logitem_ops);
qf->qql_item.li_mountp = mp; qf->qql_item.li_mountp = mp;
qf->qql_format.qf_type = XFS_LI_QUOTAOFF;
qf->qql_format.qf_flags = flags;
qf->qql_start_lip = start; qf->qql_start_lip = start;
qf->qql_flags = flags;
return qf; return qf;
} }

View File

@ -32,7 +32,7 @@ typedef struct xfs_dq_logitem {
typedef struct xfs_qoff_logitem { typedef struct xfs_qoff_logitem {
xfs_log_item_t qql_item; /* common portion */ xfs_log_item_t qql_item; /* common portion */
struct xfs_qoff_logitem *qql_start_lip; /* qoff-start logitem, if any */ struct xfs_qoff_logitem *qql_start_lip; /* qoff-start logitem, if any */
xfs_qoff_logformat_t qql_format; /* logged structure */ unsigned int qql_flags;
} xfs_qoff_logitem_t; } xfs_qoff_logitem_t;