On Mon, Jun 16, 2014 at 06:44:05PM +0200, Christoph Hellwig wrote: > Trying to support tiny disks only and saving a bit memory might have > made sense on an SGI O2 15 years ago, but is pretty pointless today. > > Remove the rarely tested codepath that uses various smaller in-memory > types to reduce our test matrix and make the codebase a little bit > smaller and less complicated. > > Signed-off-by: Christoph Hellwig <hch@xxxxxx> > Reviewed-by: Ben Myers <bpm@xxxxxxx> > --- > fs/xfs/Kconfig | 1 + > fs/xfs/xfs_bmap.c | 8 ++--- > fs/xfs/xfs_bmap_btree.c | 89 +++-------------------------------------------- > fs/xfs/xfs_bmap_util.c | 2 +- > fs/xfs/xfs_btree.c | 32 ++++++++--------- > fs/xfs/xfs_btree.h | 2 +- > fs/xfs/xfs_da_btree.c | 2 +- > fs/xfs/xfs_dir2_sf.c | 45 +++++------------------- > fs/xfs/xfs_format.h | 14 +------- > fs/xfs/xfs_fs.h | 4 +-- > fs/xfs/xfs_inode_fork.c | 4 +-- > fs/xfs/xfs_inum.h | 4 --- > fs/xfs/xfs_linux.h | 12 ------- > fs/xfs/xfs_log_format.h | 4 +-- > fs/xfs/xfs_mount.c | 6 +--- > fs/xfs/xfs_rtalloc.c | 4 +-- > fs/xfs/xfs_sb.h | 8 ++--- > fs/xfs/xfs_super.c | 8 ----- > fs/xfs/xfs_super.h | 11 ------ > fs/xfs/xfs_types.h | 29 ++------------- > 20 files changed, 50 insertions(+), 239 deletions(-) > ... > diff --git a/fs/xfs/xfs_super.h b/fs/xfs/xfs_super.h > index bbe3d15..31f757c 100644 > --- a/fs/xfs/xfs_super.h > +++ b/fs/xfs/xfs_super.h > @@ -44,16 +44,6 @@ extern void xfs_qm_exit(void); > # define XFS_REALTIME_STRING > #endif > > -#if XFS_BIG_BLKNOS > -# if XFS_BIG_INUMS > -# define XFS_BIGFS_STRING "large block/inode numbers, " > -# else > -# define XFS_BIGFS_STRING "large block numbers, " > -# endif > -#else > -# define XFS_BIGFS_STRING > -#endif > - > #ifdef DEBUG > # define XFS_DBG_STRING "debug" > #else > @@ -64,7 +54,6 @@ extern void xfs_qm_exit(void); > #define XFS_BUILD_OPTIONS XFS_ACL_STRING \ > XFS_SECURITY_STRING \ > XFS_REALTIME_STRING \ > - XFS_BIGFS_STRING \ Given that the existence of the string indicates large block/inode numbers, shouldn't we leave it to avoid any confusion? That aside, the rest of the patch looks fine to me. Brian > XFS_DBG_STRING /* DBG must be last */ > > struct xfs_inode; > diff --git a/fs/xfs/xfs_types.h b/fs/xfs/xfs_types.h > index 65c6e66..b79dc66 100644 > --- a/fs/xfs/xfs_types.h > +++ b/fs/xfs/xfs_types.h > @@ -38,43 +38,18 @@ typedef __int32_t xfs_tid_t; /* transaction identifier */ > typedef __uint32_t xfs_dablk_t; /* dir/attr block number (in file) */ > typedef __uint32_t xfs_dahash_t; /* dir/attr hash value */ > > -/* > - * These types are 64 bits on disk but are either 32 or 64 bits in memory. > - * Disk based types: > - */ > -typedef __uint64_t xfs_dfsbno_t; /* blockno in filesystem (agno|agbno) */ > -typedef __uint64_t xfs_drfsbno_t; /* blockno in filesystem (raw) */ > -typedef __uint64_t xfs_drtbno_t; /* extent (block) in realtime area */ > -typedef __uint64_t xfs_dfiloff_t; /* block number in a file */ > -typedef __uint64_t xfs_dfilblks_t; /* number of blocks in a file */ > - > -/* > - * Memory based types are conditional. > - */ > -#if XFS_BIG_BLKNOS > typedef __uint64_t xfs_fsblock_t; /* blockno in filesystem (agno|agbno) */ > typedef __uint64_t xfs_rfsblock_t; /* blockno in filesystem (raw) */ > typedef __uint64_t xfs_rtblock_t; /* extent (block) in realtime area */ > -typedef __int64_t xfs_srtblock_t; /* signed version of xfs_rtblock_t */ > -#else > -typedef __uint32_t xfs_fsblock_t; /* blockno in filesystem (agno|agbno) */ > -typedef __uint32_t xfs_rfsblock_t; /* blockno in filesystem (raw) */ > -typedef __uint32_t xfs_rtblock_t; /* extent (block) in realtime area */ > -typedef __int32_t xfs_srtblock_t; /* signed version of xfs_rtblock_t */ > -#endif > typedef __uint64_t xfs_fileoff_t; /* block number in a file */ > -typedef __int64_t xfs_sfiloff_t; /* signed block number in a file */ > typedef __uint64_t xfs_filblks_t; /* number of blocks in a file */ > > +typedef __int64_t xfs_srtblock_t; /* signed version of xfs_rtblock_t */ > +typedef __int64_t xfs_sfiloff_t; /* signed block number in a file */ > > /* > * Null values for the types. > */ > -#define NULLDFSBNO ((xfs_dfsbno_t)-1) > -#define NULLDRFSBNO ((xfs_drfsbno_t)-1) > -#define NULLDRTBNO ((xfs_drtbno_t)-1) > -#define NULLDFILOFF ((xfs_dfiloff_t)-1) > - > #define NULLFSBLOCK ((xfs_fsblock_t)-1) > #define NULLRFSBLOCK ((xfs_rfsblock_t)-1) > #define NULLRTBLOCK ((xfs_rtblock_t)-1) > -- > 1.7.10.4 > > _______________________________________________ > xfs mailing list > xfs@xxxxxxxxxxx > http://oss.sgi.com/mailman/listinfo/xfs _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs
