Re: [PATCH 06/49] xfs: separate icreate log format definitions from xfs_icreate_item.h

Brian Foster
2013-07-24T12:13:00Z

On 07/19/2013 02:24 AM, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> The on disk log format definitions for the icreate log item are
> intertwined with the kernel-only in-memory log item definitions.
> Separate the log format definitions out into their own header file
> so they can easily be shared with userspace.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> ---

Reviewed-by: Brian Foster <bfoster@redhat.com>

> fs/xfs/xfs_icreate_item.h | 18 ------------------
> fs/xfs/xfs_log_format.h | 18 ++++++++++++++++++
> 2 files changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/fs/xfs/xfs_icreate_item.h b/fs/xfs/xfs_icreate_item.h
> index 88ba8aa..59e89f8 100644
> --- a/fs/xfs/xfs_icreate_item.h
> +++ b/fs/xfs/xfs_icreate_item.h
> @@ -18,24 +18,6 @@
> #ifndef XFS_ICREATE_ITEM_H
> #define XFS_ICREATE_ITEM_H 1
>
> -/*
> - * on disk log item structure
> - *
> - * Log recovery assumes the first two entries are the type and size and they fit
> - * in 32 bits. Also in host order (ugh) so they have to be 32 bit aligned so
> - * decoding can be done correctly.
> - */
> -struct xfs_icreate_log {
> - __uint16_t icl_type; /* type of log format structure */
> - __uint16_t icl_size; /* size of log format structure */
> - __be32 icl_ag; /* ag being allocated in */
> - __be32 icl_agbno; /* start block of inode range */
> - __be32 icl_count; /* number of inodes to initialise */
> - __be32 icl_isize; /* size of inodes */
> - __be32 icl_length; /* length of extent to initialise */
> - __be32 icl_gen; /* inode generation number to use */
> -};
> -
> /* in memory log item structure */
> struct xfs_icreate_item {
> struct xfs_log_item ic_item;
> diff --git a/fs/xfs/xfs_log_format.h b/fs/xfs/xfs_log_format.h
> index 5963ec7..02639c7 100644
> --- a/fs/xfs/xfs_log_format.h
> +++ b/fs/xfs/xfs_log_format.h
> @@ -602,4 +602,22 @@ typedef struct xfs_qoff_logformat {
> #define XFS_ALL_QUOTA_CHKD \
> (XFS_UQUOTA_CHKD | XFS_GQUOTA_CHKD | XFS_PQUOTA_CHKD)
>
> +/*
> + * Inode create log item structure
> + *
> + * Log recovery assumes the first two entries are the type and size and they fit
> + * in 32 bits. Also in host order (ugh) so they have to be 32 bit aligned so
> + * decoding can be done correctly.
> + */
> +struct xfs_icreate_log {
> + __uint16_t icl_type; /* type of log format structure */
> + __uint16_t icl_size; /* size of log format structure */
> + __be32 icl_ag; /* ag being allocated in */
> + __be32 icl_agbno; /* start block of inode range */
> + __be32 icl_count; /* number of inodes to initialise */
> + __be32 icl_isize; /* size of inodes */
> + __be32 icl_length; /* length of extent to initialise */
> + __be32 icl_gen; /* inode generation number to use */
> +};
> +
> #endif /* __XFS_LOG_FORMAT_H__ */