Merge whitespace changes over

[thirdparty/xfsprogs-dev.git] / include / xfs_extfree_item.h

diff --git a/include/xfs_extfree_item.h b/include/xfs_extfree_item.h
index 3963675429eb741686c5511cac2b8e408bf94335..7122d6101d15803644220269f172ba4817118f2e 100644 (file)
--- a/include/xfs_extfree_item.h
+++ b/include/xfs_extfree_item.h
@@ -11,7 +11,7 @@
  *
  * Further, this software is distributed without any warranty that it is
  * free of the rightful claim of any third person regarding infringement
- * or the like.         Any license provided herein, whether implied or
+ * or the like.  Any license provided herein, whether implied or
  * otherwise, applies only to this software file.  Patent licenses, if
  * any, provided herein do not apply to combinations of this program with
  * other software, or any other product whatsoever.
@@ -29,11 +29,11 @@
  *
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
-#ifndef __XFS_EXTFREE_ITEM_H__
-#define __XFS_EXTFREE_ITEM_H__
+#ifndef        __XFS_EXTFREE_ITEM_H__
+#define        __XFS_EXTFREE_ITEM_H__
 
 struct xfs_mount;
-struct xfs_zone;
+struct kmem_zone;
 
 typedef struct xfs_extent {
        xfs_dfsbno_t    ext_start;
@@ -42,7 +42,7 @@ typedef struct xfs_extent {
 
 /*
  * 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
+ * log.  The efi_extents field is a variable size array whose
  * size is given by efi_nextents.
  */
 typedef struct xfs_efi_log_format {
@@ -50,12 +50,12 @@ typedef struct xfs_efi_log_format {
        unsigned short          efi_size;       /* size of this item */
        uint                    efi_nextents;   /* # extents to free */
        __uint64_t              efi_id;         /* efi identifier */
-       xfs_extent_t            efi_extents[1]; /* array of extents to free */
+       xfs_extent_t            efi_extents[1]; /* array of extents to free */
 } xfs_efi_log_format_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
+ * log.  The efd_extents array is a variable size array whose
  * size is given by efd_nextents;
  */
 typedef struct xfs_efd_log_format {
@@ -63,7 +63,7 @@ typedef struct xfs_efd_log_format {
        unsigned short          efd_size;       /* size of this item */
        uint                    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_extent_t            efd_extents[1]; /* array of extents freed */
 } xfs_efd_log_format_t;
 
 
@@ -72,14 +72,14 @@ typedef struct xfs_efd_log_format {
 /*
  * Max number of extents in fast allocation path.
  */
-#define XFS_EFI_MAX_FAST_EXTENTS       16
+#define        XFS_EFI_MAX_FAST_EXTENTS        16
 
 /*
  * Define EFI flags.
  */
-#define XFS_EFI_RECOVERED      0x1
-#define XFS_EFI_COMMITTED      0x2
-#define XFS_EFI_CANCELED       0x4
+#define        XFS_EFI_RECOVERED       0x1
+#define        XFS_EFI_COMMITTED       0x2
+#define        XFS_EFI_CANCELED        0x4
 
 /*
  * This is the "extent free intention" log item.  It is used
@@ -109,10 +109,10 @@ typedef struct xfs_efd_log_item {
 /*
  * Max number of extents in fast allocation path.
  */
-#define XFS_EFD_MAX_FAST_EXTENTS       16
+#define        XFS_EFD_MAX_FAST_EXTENTS        16
 
-extern struct xfs_zone *xfs_efi_zone;
-extern struct xfs_zone *xfs_efd_zone;
+extern struct kmem_zone        *xfs_efi_zone;
+extern struct kmem_zone        *xfs_efd_zone;
 
 xfs_efi_log_item_t     *xfs_efi_init(struct xfs_mount *, uint);
 xfs_efd_log_item_t     *xfs_efd_init(struct xfs_mount *, xfs_efi_log_item_t *,