]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs: move xfs_attr_use_log_assist out of xfs_log.c
authorDarrick J. Wong <djwong@kernel.org>
Wed, 22 Jun 2022 19:28:52 +0000 (14:28 -0500)
committerEric Sandeen <sandeen@sandeen.net>
Wed, 22 Jun 2022 19:28:52 +0000 (14:28 -0500)
Source kernel commit: d9c61ccb3b09d8f892cccbf662ce0c870f8e4ade

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 enables logged xattr updates out of "lib"xlog and into
xfs_xattr.c so that it no longer has to know about xlog_* functions.

While we're at it, give xfs_xattr.c its own header file.

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>
libxfs/libxfs_priv.h
libxfs/xfs_attr.c

index fcdcfebf60f627c30fcc916f873ebf7c5064d4cc..26fe7eaa18c2a7df3335b2ce1580332c277c15e9 100644 (file)
@@ -721,4 +721,8 @@ 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__ */
index 154ec886d59bbec2e34c80a12e11fefd866f4c24..838f2c534f83dd75dfee33c640e68543f279c823 100644 (file)
@@ -1026,7 +1026,7 @@ xfs_attr_set(
        }
 
        if (use_logging) {
-               error = xfs_attr_use_log_assist(mp);
+               error = xfs_attr_grab_log_assist(mp);
                if (error)
                        return error;
        }
@@ -1100,7 +1100,7 @@ out_unlock:
        xfs_iunlock(dp, XFS_ILOCK_EXCL);
 drop_incompat:
        if (use_logging)
-               xlog_drop_incompat_feat(mp->m_log);
+               xfs_attr_rele_log_assist(mp);
        return error;
 
 out_trans_cancel: