diff options
author | Dave Chinner <dchinner@redhat.com> | 2017-11-30 09:31:13 +1100 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2017-11-30 09:31:13 +1100 |
commit | 07d35282046d0c40ce8818bf17b616547dfdca68 (patch) | |
tree | f322b05711b2a07c4fb0f0389091fbb975e782d1 | |
parent | 3a3e54156555d32e94b29abc221cb0419d053266 (diff) | |
download | xfsprogs-dev-mkfs-refactor.tar.gz |
mkfs: tidy up definitionsmkfs-refactor
Put all the internal macro definitions at the top of the file so
they can be easily found and remove teh ones that aren't used
anymore.
Signed-Off-By: Dave Chinner <dchinner@redhat.com>
-rw-r--r-- | mkfs/xfs_mkfs.c | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index abcdfd7551..6ce521a61f 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -22,6 +22,23 @@ #include "libxcmd.h" + +#define TERABYTES(count, blog) ((uint64_t)(count) << (40 - (blog))) +#define GIGABYTES(count, blog) ((uint64_t)(count) << (30 - (blog))) +#define MEGABYTES(count, blog) ((uint64_t)(count) << (20 - (blog))) + +/* + * Use this macro before we have superblock and mount structure to + * convert from basic blocks to filesystem blocks. + */ +#define DTOBT(d, bl) ((xfs_rfsblock_t)((d) >> ((bl) - BBSHIFT))) + +/* + * amount (in bytes) we zero at the beginning and end of the device to + * remove traces of other filesystems, raid superblocks, etc. + */ +#define WHACK_SIZE (128 * 1024) + /* * XXX: The configured block and sector sizes are defined as global variables so * that they don't need to be passed to getnum/cvtnum(). @@ -873,30 +890,6 @@ struct mkfs_default_params { struct fsxattr fsx; }; -#define TERABYTES(count, blog) ((uint64_t)(count) << (40 - (blog))) -#define GIGABYTES(count, blog) ((uint64_t)(count) << (30 - (blog))) -#define MEGABYTES(count, blog) ((uint64_t)(count) << (20 - (blog))) - -/* - * Use this macro before we have superblock and mount structure - */ -#define DTOBT(d, bl) ((xfs_rfsblock_t)((d) >> ((bl) - BBSHIFT))) - -/* - * Use this for block reservations needed for mkfs's conditions - * (basically no fragmentation). - */ -#define MKFS_BLOCKRES_INODE \ - ((uint)(mp->m_ialloc_blks + (mp->m_in_maxlevels - 1))) -#define MKFS_BLOCKRES(rb) \ - ((uint)(MKFS_BLOCKRES_INODE + XFS_DA_NODE_MAXDEPTH + \ - (XFS_BM_MAXLEVELS(mp, XFS_DATA_FORK) - 1) + (rb))) - -/* amount (in bytes) we zero at the beginning and end of the device to - * remove traces of other filesystems, raid superblocks, etc. - */ -#define WHACK_SIZE (128 * 1024) - static void __attribute__((noreturn)) usage( void ) { |