* [PATCH] xfs: move the XLOG_REG_ constants out of xfs_log_format.h
@ 2025-09-15 13:24 Christoph Hellwig
2025-09-15 18:27 ` Darrick J. Wong
2025-09-19 16:15 ` Carlos Maiolino
0 siblings, 2 replies; 6+ messages in thread
From: Christoph Hellwig @ 2025-09-15 13:24 UTC (permalink / raw)
To: djwong; +Cc: linux-xfs
These are purely in-memory values and not used at all in xfsprogs.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/libxfs/xfs_log_format.h | 37 ----------------------------------
fs/xfs/xfs_log.h | 37 ++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h
index 942c490f23e4..890646b5c87a 100644
--- a/fs/xfs/libxfs/xfs_log_format.h
+++ b/fs/xfs/libxfs/xfs_log_format.h
@@ -86,43 +86,6 @@ struct xfs_unmount_log_format {
uint32_t pad2; /* may as well make it 64 bits */
};
-/* Region types for iovec's i_type */
-#define XLOG_REG_TYPE_BFORMAT 1
-#define XLOG_REG_TYPE_BCHUNK 2
-#define XLOG_REG_TYPE_EFI_FORMAT 3
-#define XLOG_REG_TYPE_EFD_FORMAT 4
-#define XLOG_REG_TYPE_IFORMAT 5
-#define XLOG_REG_TYPE_ICORE 6
-#define XLOG_REG_TYPE_IEXT 7
-#define XLOG_REG_TYPE_IBROOT 8
-#define XLOG_REG_TYPE_ILOCAL 9
-#define XLOG_REG_TYPE_IATTR_EXT 10
-#define XLOG_REG_TYPE_IATTR_BROOT 11
-#define XLOG_REG_TYPE_IATTR_LOCAL 12
-#define XLOG_REG_TYPE_QFORMAT 13
-#define XLOG_REG_TYPE_DQUOT 14
-#define XLOG_REG_TYPE_QUOTAOFF 15
-#define XLOG_REG_TYPE_LRHEADER 16
-#define XLOG_REG_TYPE_UNMOUNT 17
-#define XLOG_REG_TYPE_COMMIT 18
-#define XLOG_REG_TYPE_TRANSHDR 19
-#define XLOG_REG_TYPE_ICREATE 20
-#define XLOG_REG_TYPE_RUI_FORMAT 21
-#define XLOG_REG_TYPE_RUD_FORMAT 22
-#define XLOG_REG_TYPE_CUI_FORMAT 23
-#define XLOG_REG_TYPE_CUD_FORMAT 24
-#define XLOG_REG_TYPE_BUI_FORMAT 25
-#define XLOG_REG_TYPE_BUD_FORMAT 26
-#define XLOG_REG_TYPE_ATTRI_FORMAT 27
-#define XLOG_REG_TYPE_ATTRD_FORMAT 28
-#define XLOG_REG_TYPE_ATTR_NAME 29
-#define XLOG_REG_TYPE_ATTR_VALUE 30
-#define XLOG_REG_TYPE_XMI_FORMAT 31
-#define XLOG_REG_TYPE_XMD_FORMAT 32
-#define XLOG_REG_TYPE_ATTR_NEWNAME 33
-#define XLOG_REG_TYPE_ATTR_NEWVALUE 34
-#define XLOG_REG_TYPE_MAX 34
-
/*
* Flags to log operation header
*
diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h
index af6daf4f6792..dcc1f44ed68f 100644
--- a/fs/xfs/xfs_log.h
+++ b/fs/xfs/xfs_log.h
@@ -20,6 +20,43 @@ struct xfs_log_vec {
int lv_alloc_size; /* size of allocated lv */
};
+/* Region types for iovec's i_type */
+#define XLOG_REG_TYPE_BFORMAT 1
+#define XLOG_REG_TYPE_BCHUNK 2
+#define XLOG_REG_TYPE_EFI_FORMAT 3
+#define XLOG_REG_TYPE_EFD_FORMAT 4
+#define XLOG_REG_TYPE_IFORMAT 5
+#define XLOG_REG_TYPE_ICORE 6
+#define XLOG_REG_TYPE_IEXT 7
+#define XLOG_REG_TYPE_IBROOT 8
+#define XLOG_REG_TYPE_ILOCAL 9
+#define XLOG_REG_TYPE_IATTR_EXT 10
+#define XLOG_REG_TYPE_IATTR_BROOT 11
+#define XLOG_REG_TYPE_IATTR_LOCAL 12
+#define XLOG_REG_TYPE_QFORMAT 13
+#define XLOG_REG_TYPE_DQUOT 14
+#define XLOG_REG_TYPE_QUOTAOFF 15
+#define XLOG_REG_TYPE_LRHEADER 16
+#define XLOG_REG_TYPE_UNMOUNT 17
+#define XLOG_REG_TYPE_COMMIT 18
+#define XLOG_REG_TYPE_TRANSHDR 19
+#define XLOG_REG_TYPE_ICREATE 20
+#define XLOG_REG_TYPE_RUI_FORMAT 21
+#define XLOG_REG_TYPE_RUD_FORMAT 22
+#define XLOG_REG_TYPE_CUI_FORMAT 23
+#define XLOG_REG_TYPE_CUD_FORMAT 24
+#define XLOG_REG_TYPE_BUI_FORMAT 25
+#define XLOG_REG_TYPE_BUD_FORMAT 26
+#define XLOG_REG_TYPE_ATTRI_FORMAT 27
+#define XLOG_REG_TYPE_ATTRD_FORMAT 28
+#define XLOG_REG_TYPE_ATTR_NAME 29
+#define XLOG_REG_TYPE_ATTR_VALUE 30
+#define XLOG_REG_TYPE_XMI_FORMAT 31
+#define XLOG_REG_TYPE_XMD_FORMAT 32
+#define XLOG_REG_TYPE_ATTR_NEWNAME 33
+#define XLOG_REG_TYPE_ATTR_NEWVALUE 34
+#define XLOG_REG_TYPE_MAX 34
+
#define XFS_LOG_VEC_ORDERED (-1)
/*
--
2.47.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] xfs: move the XLOG_REG_ constants out of xfs_log_format.h
2025-09-15 13:24 [PATCH] xfs: move the XLOG_REG_ constants out of xfs_log_format.h Christoph Hellwig
@ 2025-09-15 18:27 ` Darrick J. Wong
2025-09-15 20:48 ` Christoph Hellwig
2025-09-19 16:15 ` Carlos Maiolino
1 sibling, 1 reply; 6+ messages in thread
From: Darrick J. Wong @ 2025-09-15 18:27 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-xfs
On Mon, Sep 15, 2025 at 06:24:13AM -0700, Christoph Hellwig wrote:
> These are purely in-memory values and not used at all in xfsprogs.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Looks ok, but why not move struct xfs_log_iovec as well? It's also not
part of the ondisk log format.
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
--D
> ---
> fs/xfs/libxfs/xfs_log_format.h | 37 ----------------------------------
> fs/xfs/xfs_log.h | 37 ++++++++++++++++++++++++++++++++++
> 2 files changed, 37 insertions(+), 37 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h
> index 942c490f23e4..890646b5c87a 100644
> --- a/fs/xfs/libxfs/xfs_log_format.h
> +++ b/fs/xfs/libxfs/xfs_log_format.h
> @@ -86,43 +86,6 @@ struct xfs_unmount_log_format {
> uint32_t pad2; /* may as well make it 64 bits */
> };
>
> -/* Region types for iovec's i_type */
> -#define XLOG_REG_TYPE_BFORMAT 1
> -#define XLOG_REG_TYPE_BCHUNK 2
> -#define XLOG_REG_TYPE_EFI_FORMAT 3
> -#define XLOG_REG_TYPE_EFD_FORMAT 4
> -#define XLOG_REG_TYPE_IFORMAT 5
> -#define XLOG_REG_TYPE_ICORE 6
> -#define XLOG_REG_TYPE_IEXT 7
> -#define XLOG_REG_TYPE_IBROOT 8
> -#define XLOG_REG_TYPE_ILOCAL 9
> -#define XLOG_REG_TYPE_IATTR_EXT 10
> -#define XLOG_REG_TYPE_IATTR_BROOT 11
> -#define XLOG_REG_TYPE_IATTR_LOCAL 12
> -#define XLOG_REG_TYPE_QFORMAT 13
> -#define XLOG_REG_TYPE_DQUOT 14
> -#define XLOG_REG_TYPE_QUOTAOFF 15
> -#define XLOG_REG_TYPE_LRHEADER 16
> -#define XLOG_REG_TYPE_UNMOUNT 17
> -#define XLOG_REG_TYPE_COMMIT 18
> -#define XLOG_REG_TYPE_TRANSHDR 19
> -#define XLOG_REG_TYPE_ICREATE 20
> -#define XLOG_REG_TYPE_RUI_FORMAT 21
> -#define XLOG_REG_TYPE_RUD_FORMAT 22
> -#define XLOG_REG_TYPE_CUI_FORMAT 23
> -#define XLOG_REG_TYPE_CUD_FORMAT 24
> -#define XLOG_REG_TYPE_BUI_FORMAT 25
> -#define XLOG_REG_TYPE_BUD_FORMAT 26
> -#define XLOG_REG_TYPE_ATTRI_FORMAT 27
> -#define XLOG_REG_TYPE_ATTRD_FORMAT 28
> -#define XLOG_REG_TYPE_ATTR_NAME 29
> -#define XLOG_REG_TYPE_ATTR_VALUE 30
> -#define XLOG_REG_TYPE_XMI_FORMAT 31
> -#define XLOG_REG_TYPE_XMD_FORMAT 32
> -#define XLOG_REG_TYPE_ATTR_NEWNAME 33
> -#define XLOG_REG_TYPE_ATTR_NEWVALUE 34
> -#define XLOG_REG_TYPE_MAX 34
> -
> /*
> * Flags to log operation header
> *
> diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h
> index af6daf4f6792..dcc1f44ed68f 100644
> --- a/fs/xfs/xfs_log.h
> +++ b/fs/xfs/xfs_log.h
> @@ -20,6 +20,43 @@ struct xfs_log_vec {
> int lv_alloc_size; /* size of allocated lv */
> };
>
> +/* Region types for iovec's i_type */
> +#define XLOG_REG_TYPE_BFORMAT 1
> +#define XLOG_REG_TYPE_BCHUNK 2
> +#define XLOG_REG_TYPE_EFI_FORMAT 3
> +#define XLOG_REG_TYPE_EFD_FORMAT 4
> +#define XLOG_REG_TYPE_IFORMAT 5
> +#define XLOG_REG_TYPE_ICORE 6
> +#define XLOG_REG_TYPE_IEXT 7
> +#define XLOG_REG_TYPE_IBROOT 8
> +#define XLOG_REG_TYPE_ILOCAL 9
> +#define XLOG_REG_TYPE_IATTR_EXT 10
> +#define XLOG_REG_TYPE_IATTR_BROOT 11
> +#define XLOG_REG_TYPE_IATTR_LOCAL 12
> +#define XLOG_REG_TYPE_QFORMAT 13
> +#define XLOG_REG_TYPE_DQUOT 14
> +#define XLOG_REG_TYPE_QUOTAOFF 15
> +#define XLOG_REG_TYPE_LRHEADER 16
> +#define XLOG_REG_TYPE_UNMOUNT 17
> +#define XLOG_REG_TYPE_COMMIT 18
> +#define XLOG_REG_TYPE_TRANSHDR 19
> +#define XLOG_REG_TYPE_ICREATE 20
> +#define XLOG_REG_TYPE_RUI_FORMAT 21
> +#define XLOG_REG_TYPE_RUD_FORMAT 22
> +#define XLOG_REG_TYPE_CUI_FORMAT 23
> +#define XLOG_REG_TYPE_CUD_FORMAT 24
> +#define XLOG_REG_TYPE_BUI_FORMAT 25
> +#define XLOG_REG_TYPE_BUD_FORMAT 26
> +#define XLOG_REG_TYPE_ATTRI_FORMAT 27
> +#define XLOG_REG_TYPE_ATTRD_FORMAT 28
> +#define XLOG_REG_TYPE_ATTR_NAME 29
> +#define XLOG_REG_TYPE_ATTR_VALUE 30
> +#define XLOG_REG_TYPE_XMI_FORMAT 31
> +#define XLOG_REG_TYPE_XMD_FORMAT 32
> +#define XLOG_REG_TYPE_ATTR_NEWNAME 33
> +#define XLOG_REG_TYPE_ATTR_NEWVALUE 34
> +#define XLOG_REG_TYPE_MAX 34
> +
> #define XFS_LOG_VEC_ORDERED (-1)
>
> /*
> --
> 2.47.2
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] xfs: move the XLOG_REG_ constants out of xfs_log_format.h
2025-09-15 18:27 ` Darrick J. Wong
@ 2025-09-15 20:48 ` Christoph Hellwig
2025-09-16 14:01 ` Christoph Hellwig
0 siblings, 1 reply; 6+ messages in thread
From: Christoph Hellwig @ 2025-09-15 20:48 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: Christoph Hellwig, linux-xfs
On Mon, Sep 15, 2025 at 11:27:32AM -0700, Darrick J. Wong wrote:
> On Mon, Sep 15, 2025 at 06:24:13AM -0700, Christoph Hellwig wrote:
> > These are purely in-memory values and not used at all in xfsprogs.
> >
> > Signed-off-by: Christoph Hellwig <hch@lst.de>
>
> Looks ok, but why not move struct xfs_log_iovec as well? It's also not
> part of the ondisk log format.
I have a separate series that includes the move, but I might as well
send that now.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] xfs: move the XLOG_REG_ constants out of xfs_log_format.h
2025-09-15 20:48 ` Christoph Hellwig
@ 2025-09-16 14:01 ` Christoph Hellwig
2025-09-16 14:42 ` Darrick J. Wong
0 siblings, 1 reply; 6+ messages in thread
From: Christoph Hellwig @ 2025-09-16 14:01 UTC (permalink / raw)
To: Darrick J. Wong; +Cc: Christoph Hellwig, linux-xfs
On Mon, Sep 15, 2025 at 10:48:35PM +0200, Christoph Hellwig wrote:
> On Mon, Sep 15, 2025 at 11:27:32AM -0700, Darrick J. Wong wrote:
> > On Mon, Sep 15, 2025 at 06:24:13AM -0700, Christoph Hellwig wrote:
> > > These are purely in-memory values and not used at all in xfsprogs.
> > >
> > > Signed-off-by: Christoph Hellwig <hch@lst.de>
> >
> > Looks ok, but why not move struct xfs_log_iovec as well? It's also not
> > part of the ondisk log format.
>
> I have a separate series that includes the move, but I might as well
> send that now.
I just looked into that: with my log formatting clean series,
xfs_log_iovec can and should move to xfs_log_priv.h, while right now
we could only move it to xfs_log.h. So I'd rather not move it twice
and wait a bit.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] xfs: move the XLOG_REG_ constants out of xfs_log_format.h
2025-09-16 14:01 ` Christoph Hellwig
@ 2025-09-16 14:42 ` Darrick J. Wong
0 siblings, 0 replies; 6+ messages in thread
From: Darrick J. Wong @ 2025-09-16 14:42 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-xfs
On Tue, Sep 16, 2025 at 04:01:09PM +0200, Christoph Hellwig wrote:
> On Mon, Sep 15, 2025 at 10:48:35PM +0200, Christoph Hellwig wrote:
> > On Mon, Sep 15, 2025 at 11:27:32AM -0700, Darrick J. Wong wrote:
> > > On Mon, Sep 15, 2025 at 06:24:13AM -0700, Christoph Hellwig wrote:
> > > > These are purely in-memory values and not used at all in xfsprogs.
> > > >
> > > > Signed-off-by: Christoph Hellwig <hch@lst.de>
> > >
> > > Looks ok, but why not move struct xfs_log_iovec as well? It's also not
> > > part of the ondisk log format.
> >
> > I have a separate series that includes the move, but I might as well
> > send that now.
>
> I just looked into that: with my log formatting clean series,
> xfs_log_iovec can and should move to xfs_log_priv.h, while right now
> we could only move it to xfs_log.h. So I'd rather not move it twice
> and wait a bit.
Ok.
--D
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] xfs: move the XLOG_REG_ constants out of xfs_log_format.h
2025-09-15 13:24 [PATCH] xfs: move the XLOG_REG_ constants out of xfs_log_format.h Christoph Hellwig
2025-09-15 18:27 ` Darrick J. Wong
@ 2025-09-19 16:15 ` Carlos Maiolino
1 sibling, 0 replies; 6+ messages in thread
From: Carlos Maiolino @ 2025-09-19 16:15 UTC (permalink / raw)
To: djwong, Christoph Hellwig; +Cc: linux-xfs
On Mon, 15 Sep 2025 06:24:13 -0700, Christoph Hellwig wrote:
> These are purely in-memory values and not used at all in xfsprogs.
>
>
Applied to for-next, thanks!
[1/1] xfs: move the XLOG_REG_ constants out of xfs_log_format.h
commit: 42c21838708c20dd8ba605e4099bf6a7156c3362
Best regards,
--
Carlos Maiolino <cem@kernel.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-09-19 16:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-15 13:24 [PATCH] xfs: move the XLOG_REG_ constants out of xfs_log_format.h Christoph Hellwig
2025-09-15 18:27 ` Darrick J. Wong
2025-09-15 20:48 ` Christoph Hellwig
2025-09-16 14:01 ` Christoph Hellwig
2025-09-16 14:42 ` Darrick J. Wong
2025-09-19 16:15 ` Carlos Maiolino
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).