xfs: remove the debug-only q_transp field from struct xfs_dquot
PATCH 1/1 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 f3ca87389dbf ("xfs: remove i_transp") did for the xfs_inode.
Signed-off-by Christoph Hellwig <[email protected]>
--- fs/xfs/xfs_dquot.h | 1 - fs/xfs/xfs_dquot_item.c | 5 ----- fs/xfs/xfs_trans_dquot.c | 10 ---------- 3 files changed, 16 deletions(-)
fs/xfs/xfs_dquot.h +0 -1
@@ -34,7 +34,6 @@ typedef struct xfs_dquot {uint dq_flags;/* various flags (XFS_DQ_*) */ struct list_head q_lru;/* global free list of dquots */ 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 */ xfs_daddr_t q_blkno;/* blkno of dquot buffer */ int q_bufoffset;/* off of dq in buffer (# dquots) */
fs/xfs/xfs_dquot_item.c +0 -5
@@ -223,11 +223,6 @@ xfs_qm_dquot_logitem_unlock(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 * a transaction. Their locking and unlocking is hidden inside the
fs/xfs/xfs_trans_dquot.c +0 -10
@@ -29,7 +29,6 @@ xfs_trans_dqjoin( xfs_trans_t *tp, xfs_dquot_t *dqp) { -ASSERT (dqp->q_transp != tp);ASSERT (XFS_DQ_IS_LOCKED (dqp));ASSERT (dqp->q_logitem.qli_dquot == dqp);
@@ -37,15 +36,8 @@ xfs_trans_dqjoin(* Get a log_item_desc to point at the new 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 * to be logged when the transaction is committed. The dquot must
@@ -61,7 +53,6 @@ xfs_trans_log_dquot( xfs_trans_t *tp, xfs_dquot_t *dqp) { -ASSERT (dqp->q_transp == tp);ASSERT (XFS_DQ_IS_LOCKED (dqp)); tp->t_flags |=XFS_TRANS_DIRTY ;
@@ -347,7 +338,6 @@ xfs_trans_apply_dquot_deltas(break ;ASSERT (XFS_DQ_IS_LOCKED (dqp)); -ASSERT (dqp->q_transp == tp);/* * adjust the actual number of blocks used
Signature · 1 line
2.20.1
Quoted 6 lines · Christoph Hellwig
The field is only used for a few assertations. Shrink the dqout structure instead, similarly to what commit
f3ca87389dbf("xfs: removei_transp") did for thexfs_inode.Signed-off-by Christoph Hellwig <[email protected]>---
Reviewed-by Brian Foster <[email protected]>
Quoted 80 lines
fs/xfs/xfs_dquot.h | 1 - fs/xfs/xfs_dquot_item.c | 5 ----- fs/xfs/xfs_trans_dquot.c | 10 ---------- 3 files changed, 16 deletions(-)fs/xfs/xfs_dquot.h +0
-1@@ -34,7 +34,6 @@ typedef struct xfs_dquot {uint dq_flags;/* various flags (XFS_DQ_*) */ struct list_head q_lru;/* global free list of dquots */ 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 */ xfs_daddr_t q_blkno;/* blkno of dquot buffer */ int q_bufoffset;/* off of dq in buffer (# dquots) */ fs/xfs/xfs_dquot_item.c +0
-5@@ -223,11 +223,6 @@ xfs_qm_dquot_logitem_unlock(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 * a transaction. Their locking and unlocking is hidden inside the fs/xfs/xfs_trans_dquot.c +0
-10@@ -29,7 +29,6 @@ xfs_trans_dqjoin( xfs_trans_t *tp, xfs_dquot_t *dqp) { -ASSERT (dqp->q_transp != tp);ASSERT (XFS_DQ_IS_LOCKED (dqp));ASSERT (dqp->q_logitem.qli_dquot == dqp);@@ -37,15 +36,8 @@ xfs_trans_dqjoin(* Get a log_item_desc to point at the new 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 * to be logged when the transaction is committed. The dquot must @@ -61,7 +53,6 @@ xfs_trans_log_dquot( xfs_trans_t *tp, xfs_dquot_t *dqp) { -ASSERT (dqp->q_transp == tp);ASSERT (XFS_DQ_IS_LOCKED (dqp)); tp->t_flags |=XFS_TRANS_DIRTY ;@@ -347,7 +338,6 @@ xfs_trans_apply_dquot_deltas(break ;ASSERT (XFS_DQ_IS_LOCKED (dqp)); -ASSERT (dqp->q_transp == tp);/* * adjust the actual number of blocks used Signature · 1 line
2.20.1