diff options
author | Barry Naujok <bnaujok@sgi.com> | 2008-10-30 01:52:35 -0400 |
---|---|---|
committer | Lachlan McIlroy <lachlan@sgi.com> | 2008-10-30 01:52:35 -0400 |
commit | 46039928c9abe466ed1bc0da20c2e596b1d41236 (patch) | |
tree | 7f687ad545e5dffbb1ab1e7938a176abadf324dd /fs/xfs | |
parent | d07c60e54fb7647d8247ae392f128e8ee8f3e5f3 (diff) |
[XFS] Remove final remnants of dirv1 macros and other stuff
SGI-PV: 981498
SGI-Modid: xfs-linux-melb:xfs-kern:32002a
Signed-off-by: Barry Naujok <bnaujok@sgi.com>
Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/xfs_da_btree.h | 20 | ||||
-rw-r--r-- | fs/xfs/xfs_mount.h | 1 |
2 files changed, 0 insertions, 21 deletions
diff --git a/fs/xfs/xfs_da_btree.h b/fs/xfs/xfs_da_btree.h index 8be0b00ede9a..599e270e6959 100644 --- a/fs/xfs/xfs_da_btree.h +++ b/fs/xfs/xfs_da_btree.h | |||
@@ -72,27 +72,7 @@ typedef struct xfs_da_intnode { | |||
72 | typedef struct xfs_da_node_hdr xfs_da_node_hdr_t; | 72 | typedef struct xfs_da_node_hdr xfs_da_node_hdr_t; |
73 | typedef struct xfs_da_node_entry xfs_da_node_entry_t; | 73 | typedef struct xfs_da_node_entry xfs_da_node_entry_t; |
74 | 74 | ||
75 | #define XFS_DA_MAXHASH ((xfs_dahash_t)-1) /* largest valid hash value */ | ||
76 | |||
77 | #define XFS_LBSIZE(mp) (mp)->m_sb.sb_blocksize | 75 | #define XFS_LBSIZE(mp) (mp)->m_sb.sb_blocksize |
78 | #define XFS_LBLOG(mp) (mp)->m_sb.sb_blocklog | ||
79 | |||
80 | #define XFS_DA_MAKE_BNOENTRY(mp,bno,entry) \ | ||
81 | (((bno) << (mp)->m_dircook_elog) | (entry)) | ||
82 | #define XFS_DA_MAKE_COOKIE(mp,bno,entry,hash) \ | ||
83 | (((xfs_off_t)XFS_DA_MAKE_BNOENTRY(mp, bno, entry) << 32) | (hash)) | ||
84 | #define XFS_DA_COOKIE_HASH(mp,cookie) ((xfs_dahash_t)cookie) | ||
85 | #define XFS_DA_COOKIE_BNO(mp,cookie) \ | ||
86 | ((((xfs_off_t)(cookie) >> 31) == -1LL ? \ | ||
87 | (xfs_dablk_t)0 : \ | ||
88 | (xfs_dablk_t)((xfs_off_t)(cookie) >> \ | ||
89 | ((mp)->m_dircook_elog + 32)))) | ||
90 | #define XFS_DA_COOKIE_ENTRY(mp,cookie) \ | ||
91 | ((((xfs_off_t)(cookie) >> 31) == -1LL ? \ | ||
92 | (xfs_dablk_t)0 : \ | ||
93 | (xfs_dablk_t)(((xfs_off_t)(cookie) >> 32) & \ | ||
94 | ((1 << (mp)->m_dircook_elog) - 1)))) | ||
95 | |||
96 | 76 | ||
97 | /*======================================================================== | 77 | /*======================================================================== |
98 | * Btree searching and modification structure definitions. | 78 | * Btree searching and modification structure definitions. |
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index f3c1024b1241..49d647e730e1 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h | |||
@@ -267,7 +267,6 @@ typedef struct xfs_mount { | |||
267 | xfs_buftarg_t *m_ddev_targp; /* saves taking the address */ | 267 | xfs_buftarg_t *m_ddev_targp; /* saves taking the address */ |
268 | xfs_buftarg_t *m_logdev_targp;/* ptr to log device */ | 268 | xfs_buftarg_t *m_logdev_targp;/* ptr to log device */ |
269 | xfs_buftarg_t *m_rtdev_targp; /* ptr to rt device */ | 269 | xfs_buftarg_t *m_rtdev_targp; /* ptr to rt device */ |
270 | __uint8_t m_dircook_elog; /* log d-cookie entry bits */ | ||
271 | __uint8_t m_blkbit_log; /* blocklog + NBBY */ | 270 | __uint8_t m_blkbit_log; /* blocklog + NBBY */ |
272 | __uint8_t m_blkbb_log; /* blocklog - BBSHIFT */ | 271 | __uint8_t m_blkbb_log; /* blocklog - BBSHIFT */ |
273 | __uint8_t m_agno_log; /* log #ag's */ | 272 | __uint8_t m_agno_log; /* log #ag's */ |