Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bb85ef3 authored by Dave Chinner's avatar Dave Chinner Committed by Ben Myers
Browse files

xfs: move unrelated definitions out of xfs_inode.h 



Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarMark Tinguely <tinguely@sgi.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 5c4d97d0

fs/xfs/xfs_ialloc.c

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include "xfs_cksum.h"

#include "xfs_buf_item.h"

#include "xfs_icreate_item.h"

#include "xfs_icache.h"





/*

fs/xfs/xfs_icache.h

+7 −0
Original line number Diff line number Diff line
@@ -24,6 +24,13 @@ struct xfs_perag; 
#define SYNC_WAIT		0x0001	/* wait for i/o to complete */

#define SYNC_TRYLOCK		0x0002  /* only try to lock inodes */



/*

 * Flags for xfs_iget()

 */

#define XFS_IGET_CREATE		0x1

#define XFS_IGET_UNTRUSTED	0x2

#define XFS_IGET_DONTCACHE	0x4



int xfs_iget(struct xfs_mount *mp, struct xfs_trans *tp, xfs_ino_t ino,

	     uint flags, uint lock_flags, xfs_inode_t **ipp);

fs/xfs/xfs_inode.h

+0 −38
Original line number Diff line number Diff line
@@ -34,37 +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__



struct xfs_buf;
@@ -400,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);

fs/xfs/xfs_log_format.h

+8 −0
Original line number Diff line number Diff line
@@ -392,6 +392,14 @@ 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.

 *