xfs: remove unused m_dmevmask from xfs_mount struct

The dmevmask structure member is a dmapi leftover; it's
set here and there but never actually used.  Remove it.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Bill O'Donnell <billodo@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 00240c9ee72e2c07cc653c33885dea21caf1097e..1937a93db6e7e434570128f45cd62c674f4fca86 100644 (file)
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -5127,16 +5127,9 @@ xlog_recover_process_iunlinks(
        xfs_agino_t     agino;
        int             bucket;
        int             error;
-       uint            mp_dmevmask;
 
        mp = log->l_mp;
 
-       /*
-        * Prevent any DMAPI event from being sent while in this function.
-        */
-       mp_dmevmask = mp->m_dmevmask;
-       mp->m_dmevmask = 0;
-
        for (agno = 0; agno < mp->m_sb.sb_agcount; agno++) {
                /*
                 * Find the agi for this ag.
@@ -5172,8 +5165,6 @@ xlog_recover_process_iunlinks(
                }
                xfs_buf_rele(agibp);
        }
-
-       mp->m_dmevmask = mp_dmevmask;
 }
 
 STATIC int

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 98fd41cbb9e10a3331ede6273271d6dc32da262f..6f5a5e6764d83f6e73912167103b0f2684574a6d 100644 (file)
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -803,8 +803,6 @@ xfs_mountfs(
                 get_unaligned_be16(&sbp->sb_uuid.b[4]);
        mp->m_fixedfsid[1] = get_unaligned_be32(&sbp->sb_uuid.b[0]);
 
-       mp->m_dmevmask = 0;     /* not persistent; set after each mount */
-
        error = xfs_da_mount(mp);
        if (error) {
                xfs_warn(mp, "Failed dir/attr init: %d", error);

diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index e0792d036be202d18bd479b5c6cfff904f996778..44a63c5f43c802865d329cdbe39c38cf55c025b9 100644 (file)
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -138,7 +138,6 @@ typedef struct xfs_mount {
        spinlock_t              m_perag_lock;   /* lock for m_perag_tree */
        struct mutex            m_growlock;     /* growfs mutex */
        int                     m_fixedfsid[2]; /* unchanged for life of FS */
-       uint                    m_dmevmask;     /* DMI events for this FS */
        uint64_t                m_flags;        /* global mount flags */
        bool                    m_inotbt_nores; /* no per-AG finobt resv. */
        int                     m_ialloc_inos;  /* inodes in inode allocation */