xfs: don't set XFS_TRANS_HAS_INTENT_DONE when there's no ATTRD log item

XFS_TRANS_HAS_INTENT_DONE is a flag to the CIL that we've added a log
intent done item to the transaction.  This enables an optimization
wherein we avoid writing out log intent and log intent done items if
they would have ended up in the same checkpoint.  This reduces writes to
the ondisk log and speeds up recovery as a result.

However, callers can use the defer ops machinery to modify xattrs
without using the log items.  In this situation, there won't be an
intent done item, so we do not need to set the flag.

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

diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
index bd23c9594a0d69419ec78e5479940a23dd04893f..d19a385f92890a73d07ecd686d7275010256bdea 100644 (file)
--- a/fs/xfs/xfs_attr_item.c
+++ b/fs/xfs/xfs_attr_item.c
@@ -347,13 +347,15 @@ out:
         * 1.) releases the ATTRI and frees the ATTRD
         * 2.) shuts down the filesystem
         */
-       args->trans->t_flags |= XFS_TRANS_DIRTY | XFS_TRANS_HAS_INTENT_DONE;
+       args->trans->t_flags |= XFS_TRANS_DIRTY;
 
        /*
         * attr intent/done items are null when logged attributes are disabled
         */
-       if (attrdp)
+       if (attrdp) {
+               args->trans->t_flags |= XFS_TRANS_HAS_INTENT_DONE;
                set_bit(XFS_LI_DIRTY, &attrdp->attrd_item.li_flags);
+       }
 
        return error;
 }