xfs: split out EFI/EFD log item format definition

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@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

1 files changed, 2 insertions, 86 deletions

diff --git a/fs/xfs/xfs_extfree_item.h b/fs/xfs/xfs_extfree_item.h
index 432222418c56..0ffbce32d569 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__ */