Commit 508b6b3b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Dave Chinner
Browse files

xfs: merge xfs_inum.h into xfs_format.h 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent bb58e618

fs/xfs/libxfs/xfs_bmap.c

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

#include "xfs_trans_resv.h"

#include "xfs_bit.h"

#include "xfs_inum.h"

#include "xfs_sb.h"

#include "xfs_mount.h"

#include "xfs_da_format.h"

fs/xfs/libxfs/xfs_dir2.c

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

#include "xfs_log_format.h"

#include "xfs_trans_resv.h"

#include "xfs_inum.h"

#include "xfs_mount.h"

#include "xfs_da_format.h"

#include "xfs_da_btree.h"

fs/xfs/libxfs/xfs_format.h

+35 −0
Original line number Diff line number Diff line
@@ -1068,6 +1068,41 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev) 
	 XFS_DIFLAG_PROJINHERIT | XFS_DIFLAG_NOSYMLINKS | XFS_DIFLAG_EXTSIZE | \

	 XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_FILESTREAM)



/*

 * Inode number format:

 * low inopblog bits - offset in block

 * next agblklog bits - block number in ag

 * next agno_log bits - ag number

 * high agno_log-agblklog-inopblog bits - 0

 */

#define	XFS_INO_MASK(k)			(__uint32_t)((1ULL << (k)) - 1)

#define	XFS_INO_OFFSET_BITS(mp)		(mp)->m_sb.sb_inopblog

#define	XFS_INO_AGBNO_BITS(mp)		(mp)->m_sb.sb_agblklog

#define	XFS_INO_AGINO_BITS(mp)		(mp)->m_agino_log

#define	XFS_INO_AGNO_BITS(mp)		(mp)->m_agno_log

#define	XFS_INO_BITS(mp)		\

	XFS_INO_AGNO_BITS(mp) + XFS_INO_AGINO_BITS(mp)

#define	XFS_INO_TO_AGNO(mp,i)		\

	((xfs_agnumber_t)((i) >> XFS_INO_AGINO_BITS(mp)))

#define	XFS_INO_TO_AGINO(mp,i)		\

	((xfs_agino_t)(i) & XFS_INO_MASK(XFS_INO_AGINO_BITS(mp)))

#define	XFS_INO_TO_AGBNO(mp,i)		\

	(((xfs_agblock_t)(i) >> XFS_INO_OFFSET_BITS(mp)) & \

		XFS_INO_MASK(XFS_INO_AGBNO_BITS(mp)))

#define	XFS_INO_TO_OFFSET(mp,i)		\

	((int)(i) & XFS_INO_MASK(XFS_INO_OFFSET_BITS(mp)))

#define	XFS_INO_TO_FSB(mp,i)		\

	XFS_AGB_TO_FSB(mp, XFS_INO_TO_AGNO(mp,i), XFS_INO_TO_AGBNO(mp,i))

#define	XFS_AGINO_TO_INO(mp,a,i)	\

	(((xfs_ino_t)(a) << XFS_INO_AGINO_BITS(mp)) | (i))

#define	XFS_AGINO_TO_AGBNO(mp,i)	((i) >> XFS_INO_OFFSET_BITS(mp))

#define	XFS_AGINO_TO_OFFSET(mp,i)	\

	((i) & XFS_INO_MASK(XFS_INO_OFFSET_BITS(mp)))

#define	XFS_OFFBNO_TO_AGINO(mp,b,o)	\

	((xfs_agino_t)(((b) << XFS_INO_OFFSET_BITS(mp)) | (o)))



#define	XFS_MAXINUMBER		((xfs_ino_t)((1ULL << 56) - 1ULL))

#define	XFS_MAXINUMBER_32	((xfs_ino_t)((1ULL << 32) - 1ULL))



/*

 * RealTime Device format definitions

fs/xfs/libxfs/xfs_ialloc.c

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

#include "xfs_trans_resv.h"

#include "xfs_bit.h"

#include "xfs_inum.h"

#include "xfs_sb.h"

#include "xfs_mount.h"

#include "xfs_inode.h"

fs/xfs/libxfs/xfs_inode_fork.c

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

#include "xfs_log_format.h"

#include "xfs_trans_resv.h"

#include "xfs_inum.h"

#include "xfs_mount.h"

#include "xfs_inode.h"

#include "xfs_trans.h"