diff options
author | Christoph Hellwig <hch@lst.de> | 2009-03-29 03:51:14 -0400 |
---|---|---|
committer | Christoph Hellwig <hch@brick.lst.de> | 2009-03-29 03:51:14 -0400 |
commit | 6447c36209c4268352d55d04d041396ebb8add4a (patch) | |
tree | 4aeea6dd797c6e8eceb9f9924d44f76b3237c6ef | |
parent | a19d9f887d81106d52cacbc9930207b487e07e0e (diff) |
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>
-rw-r--r-- | fs/xfs/xfs_dinode.h | 4 | ||||
-rw-r--r-- | fs/xfs/xfs_mount.c | 1 | ||||
-rw-r--r-- | fs/xfs/xfs_mount.h | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_dinode.h b/fs/xfs/xfs_dinode.h index 162e8726df5e..e5b153b2e6a3 100644 --- a/fs/xfs/xfs_dinode.h +++ b/fs/xfs/xfs_dinode.h | |||
@@ -103,7 +103,9 @@ typedef enum xfs_dinode_fmt { | |||
103 | /* | 103 | /* |
104 | * Inode size for given fs. | 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 | #define XFS_BROOT_SIZE_ADJ \ | 109 | #define XFS_BROOT_SIZE_ADJ \ |
108 | (XFS_BTREE_LBLOCK_LEN - sizeof(xfs_bmdr_block_t)) | 110 | (XFS_BTREE_LBLOCK_LEN - sizeof(xfs_bmdr_block_t)) |
109 | 111 | ||
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 2549a235dad2..efa169da2b02 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c | |||
@@ -574,7 +574,6 @@ xfs_mount_common(xfs_mount_t *mp, xfs_sb_t *sbp) | |||
574 | mp->m_sectbb_log = sbp->sb_sectlog - BBSHIFT; | 574 | mp->m_sectbb_log = sbp->sb_sectlog - BBSHIFT; |
575 | mp->m_agno_log = xfs_highbit32(sbp->sb_agcount - 1) + 1; | 575 | mp->m_agno_log = xfs_highbit32(sbp->sb_agcount - 1) + 1; |
576 | mp->m_agino_log = sbp->sb_inopblog + sbp->sb_agblklog; | 576 | mp->m_agino_log = sbp->sb_inopblog + sbp->sb_agblklog; |
577 | mp->m_litino = sbp->sb_inodesize - sizeof(struct xfs_dinode); | ||
578 | mp->m_blockmask = sbp->sb_blocksize - 1; | 577 | mp->m_blockmask = sbp->sb_blocksize - 1; |
579 | mp->m_blockwsize = sbp->sb_blocksize >> XFS_WORDLOG; | 578 | mp->m_blockwsize = sbp->sb_blocksize >> XFS_WORDLOG; |
580 | mp->m_blockwmask = mp->m_blockwsize - 1; | 579 | mp->m_blockwmask = mp->m_blockwsize - 1; |
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index e27b829dfa82..52d8da23366b 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h | |||
@@ -281,7 +281,6 @@ typedef struct xfs_mount { | |||
281 | uint m_attr_node_ents; /* #entries in attr danode */ | 281 | uint m_attr_node_ents; /* #entries in attr danode */ |
282 | int m_ialloc_inos; /* inodes in inode allocation */ | 282 | int m_ialloc_inos; /* inodes in inode allocation */ |
283 | int m_ialloc_blks; /* blocks in inode allocation */ | 283 | int m_ialloc_blks; /* blocks in inode allocation */ |
284 | int m_litino; /* size of inode union area */ | ||
285 | int m_inoalign_mask;/* mask sb_inoalignmt if used */ | 284 | int m_inoalign_mask;/* mask sb_inoalignmt if used */ |
286 | uint m_qflags; /* quota status flags */ | 285 | uint m_qflags; /* quota status flags */ |
287 | xfs_trans_reservations_t m_reservations;/* precomputed res values */ | 286 | xfs_trans_reservations_t m_reservations;/* precomputed res values */ |