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

Commit 6447c362 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Christoph Hellwig
Browse files

xfs: remove m_litino 



With the upcoming v3 inodes the inode data/attr area size needs to be
calculated for each specific inode, so we can't cache it in the superblock
anymore.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarEric Sandeen <sandeen@sandeen.net>
Reviewed-by: default avatarFelix Blyakher <felixb@sgi.com>
parent a19d9f88

fs/xfs/xfs_dinode.h

+3 −1
Original line number Diff line number Diff line
@@ -103,7 +103,9 @@ typedef enum xfs_dinode_fmt { 
/*

 * Inode size for given fs.

 */

#define	XFS_LITINO(mp)	((mp)->m_litino)

#define XFS_LITINO(mp) \

	((int)(((mp)->m_sb.sb_inodesize) - sizeof(struct xfs_dinode)))



#define	XFS_BROOT_SIZE_ADJ	\

	(XFS_BTREE_LBLOCK_LEN - sizeof(xfs_bmdr_block_t))

fs/xfs/xfs_mount.c

+0 −1
Original line number Diff line number Diff line
@@ -574,7 +574,6 @@ xfs_mount_common(xfs_mount_t *mp, xfs_sb_t *sbp) 
	mp->m_sectbb_log = sbp->sb_sectlog - BBSHIFT;

	mp->m_agno_log = xfs_highbit32(sbp->sb_agcount - 1) + 1;

	mp->m_agino_log = sbp->sb_inopblog + sbp->sb_agblklog;

	mp->m_litino = sbp->sb_inodesize - sizeof(struct xfs_dinode);

	mp->m_blockmask = sbp->sb_blocksize - 1;

	mp->m_blockwsize = sbp->sb_blocksize >> XFS_WORDLOG;

	mp->m_blockwmask = mp->m_blockwsize - 1;

fs/xfs/xfs_mount.h

+0 −1
Original line number Diff line number Diff line
@@ -281,7 +281,6 @@ typedef struct xfs_mount { 
	uint			m_attr_node_ents; /* #entries in attr danode */

	int			m_ialloc_inos;	/* inodes in inode allocation */

	int			m_ialloc_blks;	/* blocks in inode allocation */

	int			m_litino;	/* size of inode union area */

	int			m_inoalign_mask;/* mask sb_inoalignmt if used */

	uint			m_qflags;	/* quota status flags */

	xfs_trans_reservations_t m_reservations;/* precomputed res values */