xfs: separate icreate log format definitions from xfs_icreate_item.h

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>
Review-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>

diff --git a/include/Makefile b/include/Makefile
index 8f738a88410123eea31f504bf3b20733b37518a3..ab71aadbb0278d0b9cf4d9283e064a30980fc9f2 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -30,7 +30,6 @@ QAHFILES = libxfs.h libxlog.h \
        xfs_format.h \
        xfs_ialloc.h \
        xfs_ialloc_btree.h \
-       xfs_icreate_item.h \
        xfs_inode.h \
        xfs_inum.h \
        xfs_log_format.h \

diff --git a/include/libxfs.h b/include/libxfs.h
index 646ca793bcb25b4c1c03802a9e8a349ecfc7be04..bc900827cc10c285e64516346acf86a9ac20e1ac 100644 (file)
--- a/include/libxfs.h
+++ b/include/libxfs.h
@@ -59,7 +59,6 @@
 #include <xfs/xfs_bmap.h>
 #include <xfs/xfs_trace.h>
 #include <xfs/xfs_symlink.h>
-#include <xfs/xfs_icreate_item.h>
 
 
 #ifndef ARRAY_SIZE

diff --git a/include/libxlog.h b/include/libxlog.h
index ee2321229c904455fa7391f577b26e28547d23c5..e65b607565e69358c838a25f8565dd3afa15bf28 100644 (file)
--- a/include/libxlog.h
+++ b/include/libxlog.h
@@ -48,7 +48,6 @@ struct xlog {
 };
 
 #include <xfs/xfs_log_recover.h>
-#include <xfs/xfs_icreate_item.h>
 
 /*
  * macros mapping kernel code to user code

diff --git a/include/xfs_icreate_item.h b/include/xfs_icreate_item.h
deleted file mode 100644 (file)
index 70dc03c..0000000
--- a/include/xfs_icreate_item.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2008-2010, Dave Chinner
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write the Free Software Foundation,
- * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-#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 */
-};
-
-#ifdef __KERNEL__
-
-/* in memory log item structure */
-struct xfs_icreate_item {
-       struct xfs_log_item     ic_item;
-       struct xfs_icreate_log  ic_format;
-};
-
-extern kmem_zone_t *xfs_icreate_zone;  /* inode create item zone */
-
-void xfs_icreate_log(struct xfs_trans *tp, xfs_agnumber_t agno,
-                       xfs_agblock_t agbno, unsigned int count,
-                       unsigned int inode_size, xfs_agblock_t length,
-                       unsigned int generation);
-#endif /* __KERNEL__ */
-
-#endif /* XFS_ICREATE_ITEM_H */

diff --git a/include/xfs_log_format.h b/include/xfs_log_format.h
index 2c0f3f1a56f5d4f8b76a17542c1059479e600355..51d493218463c106ae818a31e615bd77e115ab6f 100644 (file)
--- a/include/xfs_log_format.h
+++ b/include/xfs_log_format.h
@@ -608,4 +608,22 @@ typedef struct xfs_qoff_logformat {
                                 XFS_PQUOTA_ACCT|XFS_PQUOTA_ENFD|\
                                 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__ */