xfs: remove the unused pag_active_wq field in struct xfs_perag

pag_active_wq is only woken, but never waited for.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/fs/xfs/libxfs/xfs_ag.c b/fs/xfs/libxfs/xfs_ag.c
index 1b6027ad9ce5f66565ab6a7270efc7dfa4eff5e0..b9677abee70fd66e6aee41d9b1ef8a397f818ee5 100644 (file)
--- a/fs/xfs/libxfs/xfs_ag.c
+++ b/fs/xfs/libxfs/xfs_ag.c
@@ -107,8 +107,7 @@ xfs_perag_rele(
        struct xfs_perag        *pag)
 {
        trace_xfs_perag_rele(pag, _RET_IP_);
-       if (atomic_dec_and_test(&pag->pag_active_ref))
-               wake_up(&pag->pag_active_wq);
+       atomic_dec(&pag->pag_active_ref);
 }
 
 /*
@@ -326,7 +325,6 @@ xfs_initialize_perag(
                INIT_RADIX_TREE(&pag->pag_ici_root, GFP_ATOMIC);
                xfs_defer_drain_init(&pag->pag_intents_drain);
                init_waitqueue_head(&pag->pagb_wait);
-               init_waitqueue_head(&pag->pag_active_wq);
                pag->pagb_tree = RB_ROOT;
                xfs_hooks_init(&pag->pag_rmap_update_hooks);
 #endif /* __KERNEL__ */

diff --git a/fs/xfs/libxfs/xfs_ag.h b/fs/xfs/libxfs/xfs_ag.h
index 79149a5ec44e9a8e2305f022a95a25f90be1f75c..958ca82524292ff88ec592157e52ca8d66111d39 100644 (file)
--- a/fs/xfs/libxfs/xfs_ag.h
+++ b/fs/xfs/libxfs/xfs_ag.h
@@ -34,7 +34,6 @@ struct xfs_perag {
        xfs_agnumber_t  pag_agno;       /* AG this structure belongs to */
        atomic_t        pag_ref;        /* passive reference count */
        atomic_t        pag_active_ref; /* active reference count */
-       wait_queue_head_t pag_active_wq;/* woken active_ref falls to zero */
        unsigned long   pag_opstate;
        uint8_t         pagf_bno_level; /* # of levels in bno btree */
        uint8_t         pagf_cnt_level; /* # of levels in cnt btree */