Commit 6447c36209c4268352d55d04d041396ebb8add4a
Committed by
Christoph Hellwig
Christoph Hellwig
1 parent
a19d9f887d
Exists in
master
and in
4 other branches
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: Christoph Hellwig <hch@lst.de> Reviewed-by: Eric Sandeen <sandeen@sandeen.net> Reviewed-by: Felix Blyakher <felixb@sgi.com>
Showing 3 changed files with 3 additions and 3 deletions Side-by-side Diff
fs/xfs/xfs_dinode.h
| ... | ... | @@ -103,7 +103,9 @@ |
| 103 | 103 | /* |
| 104 | 104 | * Inode size for given fs. |
| 105 | 105 | */ |
| 106 | -#define XFS_LITINO(mp) ((mp)->m_litino) | |
| 106 | +#define XFS_LITINO(mp) \ | |
| 107 | + ((int)(((mp)->m_sb.sb_inodesize) - sizeof(struct xfs_dinode))) | |
| 108 | + | |
| 107 | 109 | #define XFS_BROOT_SIZE_ADJ \ |
| 108 | 110 | (XFS_BTREE_LBLOCK_LEN - sizeof(xfs_bmdr_block_t)) |
| 109 | 111 |
fs/xfs/xfs_mount.c
| ... | ... | @@ -574,7 +574,6 @@ |
| 574 | 574 | mp->m_sectbb_log = sbp->sb_sectlog - BBSHIFT; |
| 575 | 575 | mp->m_agno_log = xfs_highbit32(sbp->sb_agcount - 1) + 1; |
| 576 | 576 | mp->m_agino_log = sbp->sb_inopblog + sbp->sb_agblklog; |
| 577 | - mp->m_litino = sbp->sb_inodesize - sizeof(struct xfs_dinode); | |
| 578 | 577 | mp->m_blockmask = sbp->sb_blocksize - 1; |
| 579 | 578 | mp->m_blockwsize = sbp->sb_blocksize >> XFS_WORDLOG; |
| 580 | 579 | mp->m_blockwmask = mp->m_blockwsize - 1; |
fs/xfs/xfs_mount.h
| ... | ... | @@ -281,7 +281,6 @@ |
| 281 | 281 | uint m_attr_node_ents; /* #entries in attr danode */ |
| 282 | 282 | int m_ialloc_inos; /* inodes in inode allocation */ |
| 283 | 283 | int m_ialloc_blks; /* blocks in inode allocation */ |
| 284 | - int m_litino; /* size of inode union area */ | |
| 285 | 284 | int m_inoalign_mask;/* mask sb_inoalignmt if used */ |
| 286 | 285 | uint m_qflags; /* quota status flags */ |
| 287 | 286 | xfs_trans_reservations_t m_reservations;/* precomputed res values */ |