small cleanups to help code sharing with xfsprogs

small cleanups to help code sharing with xfsprogs

[Christoph Hellwig]

Hi all,

this series has a few trivial cleanups and code moves that help
sharing more code with xfsprogs.

Diffstat:
 libxfs/xfs_attr_item.h     |    2 --
 libxfs/xfs_bmap_item.h     |    2 --
 libxfs/xfs_buf_item.h      |    2 --
 libxfs/xfs_defer.c         |    1 -
 libxfs/xfs_exchmaps_item.h |    2 --
 libxfs/xfs_extfree_item.h  |    2 --
 libxfs/xfs_inode_buf.c     |    3 ---
 libxfs/xfs_inode_item.h    |    2 --
 libxfs/xfs_inode_util.c    |    1 -
 libxfs/xfs_refcount.c      |    1 -
 libxfs/xfs_refcount_item.h |    2 --
 libxfs/xfs_rmap_item.h     |    2 --
 libxfs/xfs_rtbitmap.c      |    1 -
 libxfs/xfs_rtgroup.c       |    1 -
 libxfs/xfs_sb.c            |    1 -
 libxfs/xfs_trans.h         |    2 --
 libxfs/xfs_trans_inode.c   |    2 --
 xfs_platform.h             |    1 +
 18 files changed, 1 insertion(+), 29 deletions(-)

[PATCH 1/4] xfs: remove various unused includes in libxfs/

[Christoph Hellwig]

Remove a few unused includes in libxfs/ that cause spurious differences
between the kernel and userspace versions of these files.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/xfs/libxfs/xfs_defer.c     | 1 -
 fs/xfs/libxfs/xfs_inode_buf.c | 1 -
 fs/xfs/libxfs/xfs_refcount.c  | 1 -
 fs/xfs/libxfs/xfs_rtbitmap.c  | 1 -
 fs/xfs/libxfs/xfs_rtgroup.c   | 1 -
 fs/xfs/libxfs/xfs_sb.c        | 1 -
 6 files changed, 6 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c
index 3152acdc335d..c5fa4450281d 100644
--- a/fs/xfs/libxfs/xfs_defer.c
+++ b/fs/xfs/libxfs/xfs_defer.c
@@ -24,7 +24,6 @@
 #include "xfs_refcount.h"
 #include "xfs_bmap.h"
 #include "xfs_alloc.h"
-#include "xfs_buf.h"
 #include "xfs_da_format.h"
 #include "xfs_da_btree.h"
 #include "xfs_attr.h"
diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
index 0340e2189921..b82f067ca5b1 100644
--- a/fs/xfs/libxfs/xfs_inode_buf.c
+++ b/fs/xfs/libxfs/xfs_inode_buf.c
@@ -14,7 +14,6 @@
 #include "xfs_inode.h"
 #include "xfs_errortag.h"
 #include "xfs_error.h"
-#include "xfs_icache.h"
 #include "xfs_trans.h"
 #include "xfs_ialloc.h"
 #include "xfs_dir2.h"
diff --git a/fs/xfs/libxfs/xfs_refcount.c b/fs/xfs/libxfs/xfs_refcount.c
index 0ec6ccd8b4dc..6b67308fa594 100644
--- a/fs/xfs/libxfs/xfs_refcount.c
+++ b/fs/xfs/libxfs/xfs_refcount.c
@@ -26,7 +26,6 @@
 #include "xfs_health.h"
 #include "xfs_refcount_item.h"
 #include "xfs_rtgroup.h"
-#include "xfs_rtalloc.h"
 #include "xfs_rtrefcount_btree.h"
 
 struct kmem_cache	*xfs_refcount_intent_cache;
diff --git a/fs/xfs/libxfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c
index e62786e90f7b..590e0641ff0d 100644
--- a/fs/xfs/libxfs/xfs_rtbitmap.c
+++ b/fs/xfs/libxfs/xfs_rtbitmap.c
@@ -16,7 +16,6 @@
 #include "xfs_bmap_btree.h"
 #include "xfs_trans_space.h"
 #include "xfs_trans.h"
-#include "xfs_rtalloc.h"
 #include "xfs_error.h"
 #include "xfs_rtbitmap.h"
 #include "xfs_health.h"
diff --git a/fs/xfs/libxfs/xfs_rtgroup.c b/fs/xfs/libxfs/xfs_rtgroup.c
index fe7222bbe449..c6981f566860 100644
--- a/fs/xfs/libxfs/xfs_rtgroup.c
+++ b/fs/xfs/libxfs/xfs_rtgroup.c
@@ -27,7 +27,6 @@
 #include "xfs_trans.h"
 #include "xfs_trace.h"
 #include "xfs_inode.h"
-#include "xfs_icache.h"
 #include "xfs_buf_item.h"
 #include "xfs_rtgroup.h"
 #include "xfs_rtbitmap.h"
diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c
index d2ef7b20a49f..ce44123c98ce 100644
--- a/fs/xfs/libxfs/xfs_sb.c
+++ b/fs/xfs/libxfs/xfs_sb.c
@@ -26,7 +26,6 @@
 #include "xfs_health.h"
 #include "xfs_ag.h"
 #include "xfs_rtbitmap.h"
-#include "xfs_exchrange.h"
 #include "xfs_rtgroup.h"
 #include "xfs_rtrmap_btree.h"
 #include "xfs_rtrefcount_btree.h"
-- 
2.53.0

[PATCH 2/4] xfs: include <linux/iversion.h> in xfs_platform.h

[Christoph Hellwig]

This removes the only non-xfs inludes from libxfs/ and thus reduces the
differences between the kernel and userspace versions of these files.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/xfs/libxfs/xfs_inode_buf.c   | 2 --
 fs/xfs/libxfs/xfs_inode_util.c  | 1 -
 fs/xfs/libxfs/xfs_trans_inode.c | 2 --
 fs/xfs/xfs_platform.h           | 1 +
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
index b82f067ca5b1..282e78e5e3e8 100644
--- a/fs/xfs/libxfs/xfs_inode_buf.c
+++ b/fs/xfs/libxfs/xfs_inode_buf.c
@@ -20,8 +20,6 @@
 #include "xfs_health.h"
 #include "xfs_metafile.h"
 
-#include <linux/iversion.h>
-
 /*
  * If we are doing readahead on an inode buffer, we might be in log recovery
  * reading an inode allocation buffer that hasn't yet been replayed, and hence
diff --git a/fs/xfs/libxfs/xfs_inode_util.c b/fs/xfs/libxfs/xfs_inode_util.c
index 258ac3d0d486..16c4c2ccdbb8 100644
--- a/fs/xfs/libxfs/xfs_inode_util.c
+++ b/fs/xfs/libxfs/xfs_inode_util.c
@@ -3,7 +3,6 @@
  * Copyright (c) 2000-2006 Silicon Graphics, Inc.
  * All Rights Reserved.
  */
-#include <linux/iversion.h>
 #include "xfs_platform.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
diff --git a/fs/xfs/libxfs/xfs_trans_inode.c b/fs/xfs/libxfs/xfs_trans_inode.c
index 1a0fdcbf39fa..e3dca0652d26 100644
--- a/fs/xfs/libxfs/xfs_trans_inode.c
+++ b/fs/xfs/libxfs/xfs_trans_inode.c
@@ -15,8 +15,6 @@
 #include "xfs_trans_priv.h"
 #include "xfs_inode_item.h"
 
-#include <linux/iversion.h>
-
 /*
  * Add a locked inode to the transaction.
  *
diff --git a/fs/xfs/xfs_platform.h b/fs/xfs/xfs_platform.h
index 745d715b4c64..7b63ea26b186 100644
--- a/fs/xfs/xfs_platform.h
+++ b/fs/xfs/xfs_platform.h
@@ -50,6 +50,7 @@
 #include <linux/xattr.h>
 #include <linux/mnt_idmapping.h>
 #include <linux/debugfs.h>
+#include <linux/iversion.h>
 #include <asm/page.h>
 #include <asm/div64.h>
 #include <asm/param.h>
-- 
2.53.0

[PATCH 3/4] xfs: move xfs_*_item.h to libxfs

[Christoph Hellwig]

All these files can be used as-is in xfsprogs to replace various shades
of copy and paste.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/xfs/{ => libxfs}/xfs_attr_item.h     | 2 --
 fs/xfs/{ => libxfs}/xfs_bmap_item.h     | 2 --
 fs/xfs/{ => libxfs}/xfs_buf_item.h      | 2 --
 fs/xfs/{ => libxfs}/xfs_dquot_item.h    | 0
 fs/xfs/{ => libxfs}/xfs_exchmaps_item.h | 2 --
 fs/xfs/{ => libxfs}/xfs_extfree_item.h  | 2 --
 fs/xfs/{ => libxfs}/xfs_icreate_item.h  | 0
 fs/xfs/{ => libxfs}/xfs_inode_item.h    | 2 --
 fs/xfs/{ => libxfs}/xfs_iunlink_item.h  | 0
 fs/xfs/{ => libxfs}/xfs_refcount_item.h | 2 --
 fs/xfs/{ => libxfs}/xfs_rmap_item.h     | 2 --
 11 files changed, 16 deletions(-)
 rename fs/xfs/{ => libxfs}/xfs_attr_item.h (97%)
 rename fs/xfs/{ => libxfs}/xfs_bmap_item.h (98%)
 rename fs/xfs/{ => libxfs}/xfs_buf_item.h (98%)
 rename fs/xfs/{ => libxfs}/xfs_dquot_item.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_exchmaps_item.h (98%)
 rename fs/xfs/{ => libxfs}/xfs_extfree_item.h (98%)
 rename fs/xfs/{ => libxfs}/xfs_icreate_item.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_inode_item.h (98%)
 rename fs/xfs/{ => libxfs}/xfs_iunlink_item.h (100%)
 rename fs/xfs/{ => libxfs}/xfs_refcount_item.h (98%)
 rename fs/xfs/{ => libxfs}/xfs_rmap_item.h (98%)

diff --git a/fs/xfs/xfs_attr_item.h b/fs/xfs/libxfs/xfs_attr_item.h
similarity index 97%
rename from fs/xfs/xfs_attr_item.h
rename to fs/xfs/libxfs/xfs_attr_item.h
index d108a11b55ae..3bb3d7108a90 100644
--- a/fs/xfs/xfs_attr_item.h
+++ b/fs/xfs/libxfs/xfs_attr_item.h
@@ -6,8 +6,6 @@
 #ifndef	__XFS_ATTR_ITEM_H__
 #define	__XFS_ATTR_ITEM_H__
 
-/* kernel only ATTRI/ATTRD definitions */
-
 struct xfs_mount;
 struct kmem_zone;
 
diff --git a/fs/xfs/xfs_bmap_item.h b/fs/xfs/libxfs/xfs_bmap_item.h
similarity index 98%
rename from fs/xfs/xfs_bmap_item.h
rename to fs/xfs/libxfs/xfs_bmap_item.h
index b42fee06899d..381b8a62b47c 100644
--- a/fs/xfs/xfs_bmap_item.h
+++ b/fs/xfs/libxfs/xfs_bmap_item.h
@@ -22,8 +22,6 @@
  * bmbt metadata updates in the non-first transaction.
  */
 
-/* kernel only BUI/BUD definitions */
-
 struct xfs_mount;
 struct kmem_cache;
 
diff --git a/fs/xfs/xfs_buf_item.h b/fs/xfs/libxfs/xfs_buf_item.h
similarity index 98%
rename from fs/xfs/xfs_buf_item.h
rename to fs/xfs/libxfs/xfs_buf_item.h
index 28c79989d725..d0a1247d22c6 100644
--- a/fs/xfs/xfs_buf_item.h
+++ b/fs/xfs/libxfs/xfs_buf_item.h
@@ -6,8 +6,6 @@
 #ifndef	__XFS_BUF_ITEM_H__
 #define	__XFS_BUF_ITEM_H__
 
-/* kernel only definitions */
-
 struct xfs_buf;
 struct xfs_mount;
 
diff --git a/fs/xfs/xfs_dquot_item.h b/fs/xfs/libxfs/xfs_dquot_item.h
similarity index 100%
rename from fs/xfs/xfs_dquot_item.h
rename to fs/xfs/libxfs/xfs_dquot_item.h
diff --git a/fs/xfs/xfs_exchmaps_item.h b/fs/xfs/libxfs/xfs_exchmaps_item.h
similarity index 98%
rename from fs/xfs/xfs_exchmaps_item.h
rename to fs/xfs/libxfs/xfs_exchmaps_item.h
index efa368d25d09..4a42f70237fb 100644
--- a/fs/xfs/xfs_exchmaps_item.h
+++ b/fs/xfs/libxfs/xfs_exchmaps_item.h
@@ -22,8 +22,6 @@
  * rest of the mapping exchanges.
  */
 
-/* kernel only XMI/XMD definitions */
-
 struct xfs_mount;
 struct kmem_cache;
 
diff --git a/fs/xfs/xfs_extfree_item.h b/fs/xfs/libxfs/xfs_extfree_item.h
similarity index 98%
rename from fs/xfs/xfs_extfree_item.h
rename to fs/xfs/libxfs/xfs_extfree_item.h
index af1b0331f7af..4d8ae7438b84 100644
--- a/fs/xfs/xfs_extfree_item.h
+++ b/fs/xfs/libxfs/xfs_extfree_item.h
@@ -6,8 +6,6 @@
 #ifndef	__XFS_EXTFREE_ITEM_H__
 #define	__XFS_EXTFREE_ITEM_H__
 
-/* kernel only EFI/EFD definitions */
-
 struct xfs_mount;
 struct kmem_cache;
 
diff --git a/fs/xfs/xfs_icreate_item.h b/fs/xfs/libxfs/xfs_icreate_item.h
similarity index 100%
rename from fs/xfs/xfs_icreate_item.h
rename to fs/xfs/libxfs/xfs_icreate_item.h
diff --git a/fs/xfs/xfs_inode_item.h b/fs/xfs/libxfs/xfs_inode_item.h
similarity index 98%
rename from fs/xfs/xfs_inode_item.h
rename to fs/xfs/libxfs/xfs_inode_item.h
index 2ddcca41714f..226c9ec01434 100644
--- a/fs/xfs/xfs_inode_item.h
+++ b/fs/xfs/libxfs/xfs_inode_item.h
@@ -6,8 +6,6 @@
 #ifndef	__XFS_INODE_ITEM_H__
 #define	__XFS_INODE_ITEM_H__
 
-/* kernel only definitions */
-
 struct xfs_buf;
 struct xfs_bmbt_rec;
 struct xfs_inode;
diff --git a/fs/xfs/xfs_iunlink_item.h b/fs/xfs/libxfs/xfs_iunlink_item.h
similarity index 100%
rename from fs/xfs/xfs_iunlink_item.h
rename to fs/xfs/libxfs/xfs_iunlink_item.h
diff --git a/fs/xfs/xfs_refcount_item.h b/fs/xfs/libxfs/xfs_refcount_item.h
similarity index 98%
rename from fs/xfs/xfs_refcount_item.h
rename to fs/xfs/libxfs/xfs_refcount_item.h
index 0fc3f493342b..c94b119624b3 100644
--- a/fs/xfs/xfs_refcount_item.h
+++ b/fs/xfs/libxfs/xfs_refcount_item.h
@@ -22,8 +22,6 @@
  * to replay the refcountbt metadata updates.
  */
 
-/* kernel only CUI/CUD definitions */
-
 struct xfs_mount;
 struct kmem_cache;
 
diff --git a/fs/xfs/xfs_rmap_item.h b/fs/xfs/libxfs/xfs_rmap_item.h
similarity index 98%
rename from fs/xfs/xfs_rmap_item.h
rename to fs/xfs/libxfs/xfs_rmap_item.h
index 3a99f0117f2d..8e9a23e89fd1 100644
--- a/fs/xfs/xfs_rmap_item.h
+++ b/fs/xfs/libxfs/xfs_rmap_item.h
@@ -25,8 +25,6 @@
  * (rmapbt/bnobt/cntbt) metadata updates in the non-first transaction.
  */
 
-/* kernel only RUI/RUD definitions */
-
 struct xfs_mount;
 struct kmem_cache;
 
-- 
2.53.0

[PATCH 4/4] xfs: move xfs_trans.h to libxfs

[Christoph Hellwig]

This file can be reused in xfsprogs instead of carrying a slightly
modified version.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/xfs/{ => libxfs}/xfs_trans.h | 2 --
 1 file changed, 2 deletions(-)
 rename fs/xfs/{ => libxfs}/xfs_trans.h (99%)

diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/libxfs/xfs_trans.h
similarity index 99%
rename from fs/xfs/xfs_trans.h
rename to fs/xfs/libxfs/xfs_trans.h
index eb83c5dac032..8a98735b8e15 100644
--- a/fs/xfs/xfs_trans.h
+++ b/fs/xfs/libxfs/xfs_trans.h
@@ -6,8 +6,6 @@
 #ifndef	__XFS_TRANS_H__
 #define	__XFS_TRANS_H__
 
-/* kernel only transaction subsystem defines */
-
 struct xlog;
 struct xlog_format_buf;
 struct xfs_buf;
-- 
2.53.0

Re: small cleanups to help code sharing with xfsprogs

[Darrick J. Wong]

On Fri, Sep 25, 2026 at 05:18:25PM +0200, Christoph Hellwig wrote:
> Hi all,
> 
> this series has a few trivial cleanups and code moves that help
> sharing more code with xfsprogs.

Hrmm.  This is a somewhat different approach than what Chris Wedgwood
did for his log port to userspace.  What do the maintainers think?  I'll
defer to them as to whether pushing some of the log code into
fs/xfs/libxfs is better than pushing all the log code to fs/xfs/libxlog.

The code changes look ok, so for the whole series,
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> 
> Diffstat:
>  libxfs/xfs_attr_item.h     |    2 --
>  libxfs/xfs_bmap_item.h     |    2 --
>  libxfs/xfs_buf_item.h      |    2 --
>  libxfs/xfs_defer.c         |    1 -
>  libxfs/xfs_exchmaps_item.h |    2 --
>  libxfs/xfs_extfree_item.h  |    2 --
>  libxfs/xfs_inode_buf.c     |    3 ---
>  libxfs/xfs_inode_item.h    |    2 --
>  libxfs/xfs_inode_util.c    |    1 -
>  libxfs/xfs_refcount.c      |    1 -
>  libxfs/xfs_refcount_item.h |    2 --
>  libxfs/xfs_rmap_item.h     |    2 --
>  libxfs/xfs_rtbitmap.c      |    1 -
>  libxfs/xfs_rtgroup.c       |    1 -
>  libxfs/xfs_sb.c            |    1 -
>  libxfs/xfs_trans.h         |    2 --
>  libxfs/xfs_trans_inode.c   |    2 --
>  xfs_platform.h             |    1 +
>  18 files changed, 1 insertion(+), 29 deletions(-)
> 

Re: small cleanups to help code sharing with xfsprogs

[Christoph Hellwig]

On Fri, Sep 25, 2026 at 03:52:33PM -0700, Darrick J. Wong wrote:
> On Fri, Sep 25, 2026 at 05:18:25PM +0200, Christoph Hellwig wrote:
> > Hi all,
> > 
> > this series has a few trivial cleanups and code moves that help
> > sharing more code with xfsprogs.
> 
> Hrmm.  This is a somewhat different approach than what Chris Wedgwood
> did for his log port to userspace.

Well, that seems to have been an AI slop dump without any further
engagement from the LLM-herder, so I'm not sure it matters.

But it also is a bit of a different thing.  This series tries to reduce
the kernel/user libxfs differences, and reusing whatever we can from
the kernel helps with that.  What we do about the log becomes relevant
if/when we want to update that or share more.  My previously stated
opinion is that splitting a single kernel code base into two libraries,
which then generally are linked into the same programs again is not
helpful.  But someone comes up with a design that actually makes it
work painlessly I would not complain.  In the meantime I'd improve
the maintainability of libxfs without touching the logging code at all.

Re: small cleanups to help code sharing with xfsprogs

[Carlos Maiolino]

Back from conferences. Sorry the late reply...

On Sat, Sep 26, 2026 at 08:06:11AM +0200, Christoph Hellwig wrote:
> On Fri, Sep 25, 2026 at 03:52:33PM -0700, Darrick J. Wong wrote:
> > On Fri, Sep 25, 2026 at 05:18:25PM +0200, Christoph Hellwig wrote:
> > > Hi all,
> > > 
> > > this series has a few trivial cleanups and code moves that help
> > > sharing more code with xfsprogs.
> > 
> > Hrmm.  This is a somewhat different approach than what Chris Wedgwood
> > did for his log port to userspace.
> 
> Well, that seems to have been an AI slop dump without any further
> engagement from the LLM-herder, so I'm not sure it matters.

Indeed, I'd stay with this series, so for this series:

Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>

> 
> But it also is a bit of a different thing.  This series tries to reduce
> the kernel/user libxfs differences, and reusing whatever we can from
> the kernel helps with that.  What we do about the log becomes relevant
> if/when we want to update that or share more.  My previously stated
> opinion is that splitting a single kernel code base into two libraries,
> which then generally are linked into the same programs again is not
> helpful.  But someone comes up with a design that actually makes it
> work painlessly I would not complain.  In the meantime I'd improve
> the maintainability of libxfs without touching the logging code at all.

Agreed.

Re: small cleanups to help code sharing with xfsprogs

[Carlos Maiolino]

On Fri, 25 Sep 2026 17:18:25 +0200, Christoph Hellwig wrote:
> this series has a few trivial cleanups and code moves that help
> sharing more code with xfsprogs.
> 
> Diffstat:
>  libxfs/xfs_attr_item.h     |    2 --
>  libxfs/xfs_bmap_item.h     |    2 --
>  libxfs/xfs_buf_item.h      |    2 --
>  libxfs/xfs_defer.c         |    1 -
>  libxfs/xfs_exchmaps_item.h |    2 --
>  libxfs/xfs_extfree_item.h  |    2 --
>  libxfs/xfs_inode_buf.c     |    3 ---
>  libxfs/xfs_inode_item.h    |    2 --
>  libxfs/xfs_inode_util.c    |    1 -
>  libxfs/xfs_refcount.c      |    1 -
>  libxfs/xfs_refcount_item.h |    2 --
>  libxfs/xfs_rmap_item.h     |    2 --
>  libxfs/xfs_rtbitmap.c      |    1 -
>  libxfs/xfs_rtgroup.c       |    1 -
>  libxfs/xfs_sb.c            |    1 -
>  libxfs/xfs_trans.h         |    2 --
>  libxfs/xfs_trans_inode.c   |    2 --
>  xfs_platform.h             |    1 +
>  18 files changed, 1 insertion(+), 29 deletions(-)
> 
> [...]

Applied to for-next, thanks!

[1/4] xfs: remove various unused includes in libxfs/
      commit: 6fe0d151eaada4f3ea4947b19ac048b8894b9e88
[2/4] xfs: include <linux/iversion.h> in xfs_platform.h
      commit: 5e68008e9c0d5ec602582dd659d4d1c6f910ef4a
[3/4] xfs: move xfs_*_item.h to libxfs
      commit: 834a6a1e9633722df3bfde5f4fa830432faa360a
[4/4] xfs: move xfs_trans.h to libxfs
      commit: ce47e8aab95d6bd4f70b9cbc7308ca13b9d57660

Best regards,
-- 
Carlos Maiolino <cem@kernel.org>