xfs
[Top] [All Lists]

Re: [PATCH 04/49] xfs: split out inode log item format definition

To: xfs@xxxxxxxxxxx
Subject: Re: [PATCH 04/49] xfs: split out inode log item format definition
From: Brian Foster <bfoster@xxxxxxxxxx>
Date: Tue, 23 Jul 2013 10:01:58 -0400
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1374215120-7271-5-git-send-email-david@xxxxxxxxxxxxx>
References: <1374215120-7271-1-git-send-email-david@xxxxxxxxxxxxx> <1374215120-7271-5-git-send-email-david@xxxxxxxxxxxxx>
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7
On 07/19/2013 02:24 AM, Dave Chinner wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
> 
> The EFI/EFD item format definitions are shared with userspace. Split
> the out of header files that contain kernel only defintions to make
> it simple to shared them.
> 
> Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
> ---

Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>

>  fs/xfs/xfs_extfree_item.h | 88 
> ++---------------------------------------------
>  fs/xfs/xfs_log_format.h   | 83 ++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 85 insertions(+), 86 deletions(-)
> 
> diff --git a/fs/xfs/xfs_extfree_item.h b/fs/xfs/xfs_extfree_item.h
> index 4322224..0ffbce3 100644
> --- a/fs/xfs/xfs_extfree_item.h
> +++ b/fs/xfs/xfs_extfree_item.h
> @@ -18,93 +18,11 @@
>  #ifndef      __XFS_EXTFREE_ITEM_H__
>  #define      __XFS_EXTFREE_ITEM_H__
>  
> +/* kernel only EFI/EFD definitions */
> +
>  struct xfs_mount;
>  struct kmem_zone;
>  
> -typedef struct xfs_extent {
> -     xfs_dfsbno_t    ext_start;
> -     xfs_extlen_t    ext_len;
> -} xfs_extent_t;
> -
> -/*
> - * Since an xfs_extent_t has types (start:64, len: 32)
> - * there are different alignments on 32 bit and 64 bit kernels.
> - * So we provide the different variants for use by a
> - * conversion routine.
> - */
> -
> -typedef struct xfs_extent_32 {
> -     __uint64_t      ext_start;
> -     __uint32_t      ext_len;
> -} __attribute__((packed)) xfs_extent_32_t;
> -
> -typedef struct xfs_extent_64 {
> -     __uint64_t      ext_start;
> -     __uint32_t      ext_len;
> -     __uint32_t      ext_pad;
> -} xfs_extent_64_t;
> -
> -/*
> - * This is the structure used to lay out an efi log item in the
> - * log.  The efi_extents field is a variable size array whose
> - * size is given by efi_nextents.
> - */
> -typedef struct xfs_efi_log_format {
> -     __uint16_t              efi_type;       /* efi log item type */
> -     __uint16_t              efi_size;       /* size of this item */
> -     __uint32_t              efi_nextents;   /* # extents to free */
> -     __uint64_t              efi_id;         /* efi identifier */
> -     xfs_extent_t            efi_extents[1]; /* array of extents to free */
> -} xfs_efi_log_format_t;
> -
> -typedef struct xfs_efi_log_format_32 {
> -     __uint16_t              efi_type;       /* efi log item type */
> -     __uint16_t              efi_size;       /* size of this item */
> -     __uint32_t              efi_nextents;   /* # extents to free */
> -     __uint64_t              efi_id;         /* efi identifier */
> -     xfs_extent_32_t         efi_extents[1]; /* array of extents to free */
> -} __attribute__((packed)) xfs_efi_log_format_32_t;
> -
> -typedef struct xfs_efi_log_format_64 {
> -     __uint16_t              efi_type;       /* efi log item type */
> -     __uint16_t              efi_size;       /* size of this item */
> -     __uint32_t              efi_nextents;   /* # extents to free */
> -     __uint64_t              efi_id;         /* efi identifier */
> -     xfs_extent_64_t         efi_extents[1]; /* array of extents to free */
> -} xfs_efi_log_format_64_t;
> -
> -/*
> - * This is the structure used to lay out an efd log item in the
> - * log.  The efd_extents array is a variable size array whose
> - * size is given by efd_nextents;
> - */
> -typedef struct xfs_efd_log_format {
> -     __uint16_t              efd_type;       /* efd log item type */
> -     __uint16_t              efd_size;       /* size of this item */
> -     __uint32_t              efd_nextents;   /* # of extents freed */
> -     __uint64_t              efd_efi_id;     /* id of corresponding efi */
> -     xfs_extent_t            efd_extents[1]; /* array of extents freed */
> -} xfs_efd_log_format_t;
> -
> -typedef struct xfs_efd_log_format_32 {
> -     __uint16_t              efd_type;       /* efd log item type */
> -     __uint16_t              efd_size;       /* size of this item */
> -     __uint32_t              efd_nextents;   /* # of extents freed */
> -     __uint64_t              efd_efi_id;     /* id of corresponding efi */
> -     xfs_extent_32_t         efd_extents[1]; /* array of extents freed */
> -} __attribute__((packed)) xfs_efd_log_format_32_t;
> -
> -typedef struct xfs_efd_log_format_64 {
> -     __uint16_t              efd_type;       /* efd log item type */
> -     __uint16_t              efd_size;       /* size of this item */
> -     __uint32_t              efd_nextents;   /* # of extents freed */
> -     __uint64_t              efd_efi_id;     /* id of corresponding efi */
> -     xfs_extent_64_t         efd_extents[1]; /* array of extents freed */
> -} xfs_efd_log_format_64_t;
> -
> -
> -#ifdef __KERNEL__
> -
>  /*
>   * Max number of extents in fast allocation path.
>   */
> @@ -160,6 +78,4 @@ int                        
> xfs_efi_copy_format(xfs_log_iovec_t *buf,
>                                           xfs_efi_log_format_t *dst_efi_fmt);
>  void                 xfs_efi_item_free(xfs_efi_log_item_t *);
>  
> -#endif       /* __KERNEL__ */
> -
>  #endif       /* __XFS_EXTFREE_ITEM_H__ */
> diff --git a/fs/xfs/xfs_log_format.h b/fs/xfs/xfs_log_format.h
> index 77a6024..d1e93d3 100644
> --- a/fs/xfs/xfs_log_format.h
> +++ b/fs/xfs/xfs_log_format.h
> @@ -461,4 +461,87 @@ xfs_blft_from_flags(struct xfs_buf_log_format *blf)
>       return (blf->blf_flags & XFS_BLFT_MASK) >> XFS_BLFT_SHIFT;
>  }
>  
> +/*
> + * EFI/EFD log format definitions
> + */
> +typedef struct xfs_extent {
> +     xfs_dfsbno_t    ext_start;
> +     xfs_extlen_t    ext_len;
> +} xfs_extent_t;
> +
> +/*
> + * Since an xfs_extent_t has types (start:64, len: 32)
> + * there are different alignments on 32 bit and 64 bit kernels.
> + * So we provide the different variants for use by a
> + * conversion routine.
> + */
> +typedef struct xfs_extent_32 {
> +     __uint64_t      ext_start;
> +     __uint32_t      ext_len;
> +} __attribute__((packed)) xfs_extent_32_t;
> +
> +typedef struct xfs_extent_64 {
> +     __uint64_t      ext_start;
> +     __uint32_t      ext_len;
> +     __uint32_t      ext_pad;
> +} xfs_extent_64_t;
> +
> +/*
> + * This is the structure used to lay out an efi log item in the
> + * log.  The efi_extents field is a variable size array whose
> + * size is given by efi_nextents.
> + */
> +typedef struct xfs_efi_log_format {
> +     __uint16_t              efi_type;       /* efi log item type */
> +     __uint16_t              efi_size;       /* size of this item */
> +     __uint32_t              efi_nextents;   /* # extents to free */
> +     __uint64_t              efi_id;         /* efi identifier */
> +     xfs_extent_t            efi_extents[1]; /* array of extents to free */
> +} xfs_efi_log_format_t;
> +
> +typedef struct xfs_efi_log_format_32 {
> +     __uint16_t              efi_type;       /* efi log item type */
> +     __uint16_t              efi_size;       /* size of this item */
> +     __uint32_t              efi_nextents;   /* # extents to free */
> +     __uint64_t              efi_id;         /* efi identifier */
> +     xfs_extent_32_t         efi_extents[1]; /* array of extents to free */
> +} __attribute__((packed)) xfs_efi_log_format_32_t;
> +
> +typedef struct xfs_efi_log_format_64 {
> +     __uint16_t              efi_type;       /* efi log item type */
> +     __uint16_t              efi_size;       /* size of this item */
> +     __uint32_t              efi_nextents;   /* # extents to free */
> +     __uint64_t              efi_id;         /* efi identifier */
> +     xfs_extent_64_t         efi_extents[1]; /* array of extents to free */
> +} xfs_efi_log_format_64_t;
> +
> +/*
> + * This is the structure used to lay out an efd log item in the
> + * log.  The efd_extents array is a variable size array whose
> + * size is given by efd_nextents;
> + */
> +typedef struct xfs_efd_log_format {
> +     __uint16_t              efd_type;       /* efd log item type */
> +     __uint16_t              efd_size;       /* size of this item */
> +     __uint32_t              efd_nextents;   /* # of extents freed */
> +     __uint64_t              efd_efi_id;     /* id of corresponding efi */
> +     xfs_extent_t            efd_extents[1]; /* array of extents freed */
> +} xfs_efd_log_format_t;
> +
> +typedef struct xfs_efd_log_format_32 {
> +     __uint16_t              efd_type;       /* efd log item type */
> +     __uint16_t              efd_size;       /* size of this item */
> +     __uint32_t              efd_nextents;   /* # of extents freed */
> +     __uint64_t              efd_efi_id;     /* id of corresponding efi */
> +     xfs_extent_32_t         efd_extents[1]; /* array of extents freed */
> +} __attribute__((packed)) xfs_efd_log_format_32_t;
> +
> +typedef struct xfs_efd_log_format_64 {
> +     __uint16_t              efd_type;       /* efd log item type */
> +     __uint16_t              efd_size;       /* size of this item */
> +     __uint32_t              efd_nextents;   /* # of extents freed */
> +     __uint64_t              efd_efi_id;     /* id of corresponding efi */
> +     xfs_extent_64_t         efd_extents[1]; /* array of extents freed */
> +} xfs_efd_log_format_64_t;
> +
>  #endif /* __XFS_LOG_FORMAT_H__ */
> 

<Prev in Thread] Current Thread [Next in Thread>