xfs: move unrealted definitions out of xfs_inode.h

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 94cb8e0f23e7efb77ee3c894aafcc788131b694e..a8a4311dd686deeb0a98670e20523841e84880c3 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -31,6 +31,7 @@ QAHFILES = libxfs.h libxlog.h \
        xfs_ialloc.h \
        xfs_ialloc_btree.h \
        xfs_inode.h \
+       xfs_inode_fork.h \
        xfs_inum.h \
        xfs_log_format.h \
        xfs_log_recover.h \

diff --git a/include/libxfs.h b/include/libxfs.h
index 6d96c41ce8ce2c7537be586f9da5050bd4fbecde..05aac340aebfdbdfc1b286871b6fc67e906d5fd9 100644 (file)
--- a/include/libxfs.h
+++ b/include/libxfs.h
@@ -54,6 +54,7 @@
 #include <xfs/xfs_ialloc_btree.h>
 #include <xfs/xfs_attr_sf.h>
 #include <xfs/xfs_dinode.h>
+#include <xfs/xfs_inode_fork.h>
 #include <xfs/xfs_inode.h>
 #include <xfs/xfs_alloc.h>
 #include <xfs/xfs_btree.h>

diff --git a/include/xfs_inode.h b/include/xfs_inode.h
index 6ee8bb74f996cca4ff1bd5a745eea73bce1cee97..99c034e6a169c45fb896e76e3d3fcb183f60986d 100644 (file)
--- a/include/xfs_inode.h
+++ b/include/xfs_inode.h
@@ -34,35 +34,6 @@ struct xfs_imap {
        ushort          im_boffset;     /* inode offset in block in bytes */
 };
 
-/*
- * This is the xfs in-core inode structure.
- * Most of the on-disk inode is embedded in the i_d field.
- *
- * The extent pointers/inline file space, however, are managed
- * separately.  The memory for this information is pointed to by
- * the if_u1 unions depending on the type of the data.
- * This is used to linearize the array of extents for fast in-core
- * access.  This is used until the file's number of extents
- * surpasses XFS_MAX_INCORE_EXTENTS, at which point all extent pointers
- * are accessed through the buffer cache.
- *
- * Other state kept in the in-core inode is used for identification,
- * locking, transactional updating, etc of the inode.
- *
- * Generally, we do not want to hold the i_rlock while holding the
- * i_ilock. Hierarchy is i_iolock followed by i_rlock.
- *
- * xfs_iptr_t contains all the inode fields up to and including the
- * i_mnext and i_mprev fields, it is used as a marker in the inode
- * chain off the mount structure by xfs_sync calls.
- */
-/*
- * Flags for xfs_ichgtime().
- */
-#define        XFS_ICHGTIME_MOD        0x1     /* data fork modification timestamp */
-#define        XFS_ICHGTIME_CHG        0x2     /* inode field change timestamp */
-#define        XFS_ICHGTIME_CREATE     0x4     /* inode create timestamp */
-
 
 #ifdef __KERNEL__
 
@@ -398,13 +369,6 @@ do { \
 
 #endif /* __KERNEL__ */
 
-/*
- * Flags for xfs_iget()
- */
-#define XFS_IGET_CREATE                0x1
-#define XFS_IGET_UNTRUSTED     0x2
-#define XFS_IGET_DONTCACHE     0x4
-
 int            xfs_imap_to_bp(struct xfs_mount *, struct xfs_trans *,
                               struct xfs_imap *, struct xfs_dinode **,
                               struct xfs_buf **, uint, uint);

diff --git a/include/xfs_log_format.h b/include/xfs_log_format.h
index 13a073445f80b9e716deba1ea35b94ce5e36e6cd..f57975d2388958a505a2281c502d9a0eb2f2f9f8 100644 (file)
--- a/include/xfs_log_format.h
+++ b/include/xfs_log_format.h
@@ -392,6 +392,13 @@ struct xfs_log_item_desc {
 #define        XFS_ATTR_BTREE_REF      1
 #define        XFS_DQUOT_REF           1
 
+/*
+ * Flags for xfs_trans_ichgtime().
+ */
+#define        XFS_ICHGTIME_MOD        0x1     /* data fork modification timestamp */
+#define        XFS_ICHGTIME_CHG        0x2     /* inode field change timestamp */
+#define        XFS_ICHGTIME_CREATE     0x4     /* inode create timestamp */
+
 
 /*
  * Inode Log Item Format definitions.

diff --git a/libxfs/xfs.h b/libxfs/xfs.h
index 7149c0902dc1d56dc7e6294b65dd29d063658fe4..1a01c615de4e8a803bd1188df53d1aab3f54e22a 100644 (file)
--- a/libxfs/xfs.h
+++ b/libxfs/xfs.h
@@ -68,6 +68,9 @@ typedef __uint32_t            inst_t;         /* an instruction */
 
 #define IHOLD(ip)                      ((void) 0)
 
+#define XFS_IGET_CREATE                        0x1
+#define XFS_IGET_UNTRUSTED             0x2
+
 /* stop unused var warnings by assigning mp to itself */
 #define XFS_CORRUPTION_ERROR(e,l,mp,m) do { \
        (mp) = (mp); \