xfs: move xfs_attr_use_log_assist usage out of libxfs

Source kernel commit: efc2efeba169ff37bbd425631985064365c614e0

The LARP patchset added an awkward coupling point between libxfs and
what would be libxlog, if the XFS log were actually its own library.
Move the code that sets up logged xattr updates out of libxfs and into
xfs_xattr.c so that libxfs no longer has to know about xlog_* functions.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/libxfs_priv.h b/libxfs/libxfs_priv.h
index 26fe7eaa18c2a7df3335b2ce1580332c277c15e9..fcdcfebf60f627c30fcc916f873ebf7c5064d4cc 100644 (file)
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -721,8 +721,4 @@ int xfs_bmap_last_extent(struct xfs_trans *tp, struct xfs_inode *ip,
 /* xfs_inode.h */
 #define xfs_iflags_set(ip, flags)      do { } while (0)
 
-/* xfs_xattr.c */
-#define xfs_attr_grab_log_assist(mp)   (0)
-#define xfs_attr_rele_log_assist(mp)   ((void) 0)
-
 #endif /* __LIBXFS_INTERNAL_XFS_H__ */

diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 838f2c534f83dd75dfee33c640e68543f279c823..dfd284c6b1d5dda7eaa968f5c3c478afbd1432de 100644 (file)
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -980,7 +980,6 @@ xfs_attr_set(
        int                     error, local;
        int                     rmt_blks = 0;
        unsigned int            total;
-       bool                    use_logging = xfs_has_larp(mp);
 
        if (xfs_is_shutdown(dp->i_mount))
                return -EIO;
@@ -1025,12 +1024,6 @@ xfs_attr_set(
                rmt_blks = xfs_attr3_rmt_blocks(mp, XFS_XATTR_SIZE_MAX);
        }
 
-       if (use_logging) {
-               error = xfs_attr_grab_log_assist(mp);
-               if (error)
-                       return error;
-       }
-
        /*
         * Root fork attributes can use reserved data blocks for this
         * operation if necessary
@@ -1038,7 +1031,7 @@ xfs_attr_set(
        xfs_init_attr_trans(args, &tres, &total);
        error = xfs_trans_alloc_inode(dp, &tres, total, 0, rsvd, &args->trans);
        if (error)
-               goto drop_incompat;
+               return error;
 
        if (args->value || xfs_inode_hasattr(dp)) {
                error = xfs_iext_count_may_overflow(dp, XFS_ATTR_FORK,
@@ -1098,9 +1091,6 @@ xfs_attr_set(
        error = xfs_trans_commit(args->trans);
 out_unlock:
        xfs_iunlock(dp, XFS_ILOCK_EXCL);
-drop_incompat:
-       if (use_logging)
-               xfs_attr_rele_log_assist(mp);
        return error;
 
 out_trans_cancel: