xfs: kill xfs_bmbt_rec_32/64 types
PATCH 1/1 xfs: kill xfs_bmbt_rec_32/64 types
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.
fs/xfs/xfs_bmap_btree.h +3 -11
@@ -46,20 +46,12 @@ typedef struct xfs_bmdr_block {#define BMBT_STARTBLOCK_BITLEN 52#define BMBT_BLOCKCOUNT_BITLEN 21 - -#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 -{ +typedef struct xfs_bmbt_rec {__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 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 { __uint64_t l0, l1;
fs/xfs/xfs_inode_item.h +3 -3
@@ -127,7 +127,7 @@ static inline int xfs_ilog_fdata(int w)#ifdef __KERNEL__struct xfs_buf ; -struct xfs_bmbt_rec_64 ; +struct xfs_bmbt_rec ;struct xfs_inode ;struct xfs_mount ;
@@ -140,9 +140,9 @@ typedef struct xfs_inode_log_item {unsigned short ili_flags;/* misc flags */ unsigned short ili_logged;/* flushed logged data */ 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 */ -struct xfs_bmbt_rec_64 *ili_aextents_buf;/* array of logged +struct xfs_bmbt_rec *ili_aextents_buf;/* array of logged attr exts */ unsigned int ili_pushbuf_flag;/* one bit used in push_ail */
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 5 lines · Christoph Hellwig
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_receverywhere, without any size postfix.Signed-off-by Christoph Hellwig <[email protected]>
Yay for less confusion.
Quoted 54 lines
Index:
xfs/fs/xfs/xfs_bmap_btree.h
===================================================================fs/xfs/xfs_bmap_btree.h +3
-11@@ -46,20 +46,12 @@ typedef struct xfs_bmdr_block {#define BMBT_STARTBLOCK_BITLEN 52#define BMBT_BLOCKCOUNT_BITLEN 21 - -#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 -{ +typedef struct xfs_bmbt_rec {__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 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 { __uint64_t l0, l1;Index:
xfs/fs/xfs/xfs_inode_item.h
===================================================================fs/xfs/xfs_inode_item.h +3
-3@@ -127,7 +127,7 @@ static inline int xfs_ilog_fdata(int w)#ifdef __KERNEL__struct xfs_buf ; -struct xfs_bmbt_rec_64 ; +struct xfs_bmbt_rec ;struct xfs_inode ;struct xfs_mount ;@@ -140,9 +140,9 @@ typedef struct xfs_inode_log_item {unsigned short ili_flags;/* misc flags */ unsigned short ili_logged;/* flushed logged data */ 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 */ -struct xfs_bmbt_rec_64 *ili_aextents_buf;/* array of logged +struct xfs_bmbt_rec *ili_aextents_buf;/* array of logged attr exts */ unsigned int ili_pushbuf_flag;/* one bit used in push_ail */
Quoted 5 lines
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs