From: Dave Chinner <dchinner@xxxxxxxxxx> Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx> --- include/xfs_inode.h | 38 -------------------------------------- include/xfs_trans.h | 7 +++++++ libxfs/xfs.h | 3 +++ 3 files changed, 10 insertions(+), 38 deletions(-) diff --git a/include/xfs_inode.h b/include/xfs_inode.h index 7450b74..ec092b1 100644 --- a/include/xfs_inode.h +++ b/include/xfs_inode.h @@ -32,50 +32,12 @@ 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__ #include "xfs_inode_ops.h" #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_trans.h b/include/xfs_trans.h index 21cafaa..4654b58 100644 --- a/include/xfs_trans.h +++ b/include/xfs_trans.h @@ -227,6 +227,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 */ + #ifdef __KERNEL__ struct xfs_buf; diff --git a/libxfs/xfs.h b/libxfs/xfs.h index acf5895..0113b50 100644 --- 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); \ -- 1.7.10.4 _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs