Commit 76dee769 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong

xfs: remove the debug-only q_transp field from struct xfs_dquot

The field is only used for a few assertations.  Shrink the dqout
structure instead, similarly to what commit f3ca8738
("xfs: remove i_transp") did for the xfs_inode.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent f9a196ee
...@@ -34,7 +34,6 @@ typedef struct xfs_dquot { ...@@ -34,7 +34,6 @@ typedef struct xfs_dquot {
uint dq_flags; /* various flags (XFS_DQ_*) */ uint dq_flags; /* various flags (XFS_DQ_*) */
struct list_head q_lru; /* global free list of dquots */ struct list_head q_lru; /* global free list of dquots */
struct xfs_mount*q_mount; /* filesystem this relates to */ struct xfs_mount*q_mount; /* filesystem this relates to */
struct xfs_trans*q_transp; /* trans this belongs to currently */
uint q_nrefs; /* # active refs from inodes */ uint q_nrefs; /* # active refs from inodes */
xfs_daddr_t q_blkno; /* blkno of dquot buffer */ xfs_daddr_t q_blkno; /* blkno of dquot buffer */
int q_bufoffset; /* off of dq in buffer (# dquots) */ int q_bufoffset; /* off of dq in buffer (# dquots) */
......
...@@ -223,11 +223,6 @@ xfs_qm_dquot_logitem_unlock( ...@@ -223,11 +223,6 @@ xfs_qm_dquot_logitem_unlock(
ASSERT(XFS_DQ_IS_LOCKED(dqp)); ASSERT(XFS_DQ_IS_LOCKED(dqp));
/*
* Clear the transaction pointer in the dquot
*/
dqp->q_transp = NULL;
/* /*
* dquots are never 'held' from getting unlocked at the end of * dquots are never 'held' from getting unlocked at the end of
* a transaction. Their locking and unlocking is hidden inside the * a transaction. Their locking and unlocking is hidden inside the
......
...@@ -29,7 +29,6 @@ xfs_trans_dqjoin( ...@@ -29,7 +29,6 @@ xfs_trans_dqjoin(
xfs_trans_t *tp, xfs_trans_t *tp,
xfs_dquot_t *dqp) xfs_dquot_t *dqp)
{ {
ASSERT(dqp->q_transp != tp);
ASSERT(XFS_DQ_IS_LOCKED(dqp)); ASSERT(XFS_DQ_IS_LOCKED(dqp));
ASSERT(dqp->q_logitem.qli_dquot == dqp); ASSERT(dqp->q_logitem.qli_dquot == dqp);
...@@ -37,15 +36,8 @@ xfs_trans_dqjoin( ...@@ -37,15 +36,8 @@ xfs_trans_dqjoin(
* Get a log_item_desc to point at the new item. * Get a log_item_desc to point at the new item.
*/ */
xfs_trans_add_item(tp, &dqp->q_logitem.qli_item); xfs_trans_add_item(tp, &dqp->q_logitem.qli_item);
/*
* Initialize d_transp so we can later determine if this dquot is
* associated with this transaction.
*/
dqp->q_transp = tp;
} }
/* /*
* This is called to mark the dquot as needing * This is called to mark the dquot as needing
* to be logged when the transaction is committed. The dquot must * to be logged when the transaction is committed. The dquot must
...@@ -61,7 +53,6 @@ xfs_trans_log_dquot( ...@@ -61,7 +53,6 @@ xfs_trans_log_dquot(
xfs_trans_t *tp, xfs_trans_t *tp,
xfs_dquot_t *dqp) xfs_dquot_t *dqp)
{ {
ASSERT(dqp->q_transp == tp);
ASSERT(XFS_DQ_IS_LOCKED(dqp)); ASSERT(XFS_DQ_IS_LOCKED(dqp));
tp->t_flags |= XFS_TRANS_DIRTY; tp->t_flags |= XFS_TRANS_DIRTY;
...@@ -347,7 +338,6 @@ xfs_trans_apply_dquot_deltas( ...@@ -347,7 +338,6 @@ xfs_trans_apply_dquot_deltas(
break; break;
ASSERT(XFS_DQ_IS_LOCKED(dqp)); ASSERT(XFS_DQ_IS_LOCKED(dqp));
ASSERT(dqp->q_transp == tp);
/* /*
* adjust the actual number of blocks used * adjust the actual number of blocks used
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment