kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xfs: kill xfs_bmbt_rec_32/64 types

Browse source 
For a long time we've always stored bmap btree records in the 64bit format,
so kill off the dead 32bit type, and make sure the 64bit type is named just
xfs_bmbt_rec everywhere, without any size postfix.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
This commit is contained in:
Christoph Hellwig 2009-12-04 10:19:07 +00:00 committed by Alex Elder
parent 2ee1abad73
commit a5f9be58c2
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fs/xfs/xfs_bmap_btree.h
View file

@ -46,20 +46,12 @@ typedef struct xfs_bmdr_block {
#define BMBT_STARTBLOCK_BITLEN 52 #define BMBT_STARTBLOCK_BITLEN 52
#define BMBT_BLOCKCOUNT_BITLEN 21 #define BMBT_BLOCKCOUNT_BITLEN 21
typedef struct xfs_bmbt_rec {
#define BMBT_USE_64 1
typedef struct xfs_bmbt_rec_32
{
__uint32_t l0, l1, l2, l3;
} xfs_bmbt_rec_32_t;
typedef struct xfs_bmbt_rec_64
{
__be64 l0, l1; __be64 l0, l1;
} xfs_bmbt_rec_64_t; } xfs_bmbt_rec_t;
typedef __uint64_t xfs_bmbt_rec_base_t; /* use this for casts */ typedef __uint64_t xfs_bmbt_rec_base_t; /* use this for casts */
typedef xfs_bmbt_rec_64_t xfs_bmbt_rec_t, xfs_bmdr_rec_t; typedef xfs_bmbt_rec_t xfs_bmdr_rec_t;
typedef struct xfs_bmbt_rec_host { typedef struct xfs_bmbt_rec_host {
__uint64_t l0, l1; __uint64_t l0, l1;

6
fs/xfs/xfs_inode_item.h
View file

@ -127,7 +127,7 @@ static inline int xfs_ilog_fdata(int w)
#ifdef __KERNEL__ #ifdef __KERNEL__
struct xfs_buf; struct xfs_buf;
struct xfs_bmbt_rec_64; struct xfs_bmbt_rec;
struct xfs_inode; struct xfs_inode;
struct xfs_mount; struct xfs_mount;
@ -140,9 +140,9 @@ typedef struct xfs_inode_log_item {
unsigned short ili_flags; /* misc flags */ unsigned short ili_flags; /* misc flags */
unsigned short ili_logged; /* flushed logged data */ unsigned short ili_logged; /* flushed logged data */
unsigned int ili_last_fields; /* fields when flushed */ unsigned int ili_last_fields; /* fields when flushed */
struct xfs_bmbt_rec_64 *ili_extents_buf; /* array of logged struct xfs_bmbt_rec *ili_extents_buf; /* array of logged
data exts */ data exts */
struct xfs_bmbt_rec_64 *ili_aextents_buf; /* array of logged struct xfs_bmbt_rec *ili_aextents_buf; /* array of logged
attr exts */ attr exts */
unsigned int ili_pushbuf_flag; /* one bit used in push_ail */ unsigned int ili_pushbuf_flag; /* one bit used in push_ail */