On Tue, Feb 06, 2018 at 07:54:55PM -0600, Eric Sandeen wrote:
> 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@xxxxxxxxxx>
looks fine...
Reviewed-by: Bill O'Donnell <billodo@xxxxxxxxxx>
> ---
>
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index 00240c9..1937a93 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -5127,16 +5127,9 @@ static inline bool xlog_item_is_intent(struct xfs_log_item *lip)
> 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 @@ static inline bool xlog_item_is_intent(struct xfs_log_item *lip)
> }
> 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 98fd41c..6f5a5e6 100644
> --- a/fs/xfs/xfs_mount.c
> +++ b/fs/xfs/xfs_mount.c
> @@ -803,8 +803,6 @@
> 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 e0792d0..44a63c5 100644
> --- a/fs/xfs/xfs_mount.h
> +++ b/fs/xfs/xfs_mount.h
> @@ -138,7 +138,6 @@ struct xfs_error_cfg {
> 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 */
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
