mkfs: rename byte unit conversion macros

Rename these macros so that we can promote the generic ones in the next
patch.

Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index f859626afdda3643c514f0037ea4cd18001c5ecb..e0f0bb28e121593b001ba83e678f6bc45377be04 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -18,9 +18,10 @@
 #include "proto.h"
 #include <ini.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)))
+/* Convert a quantity of mega/giga/terabytes into units of blocks */
+#define TERABLOCKS(count, blog)        ((uint64_t)(count) << (40 - (blog)))
+#define GIGABLOCKS(count, blog)        ((uint64_t)(count) << (30 - (blog)))
+#define MEGABLOCKS(count, blog)        ((uint64_t)(count) << (20 - (blog)))
 
 /*
  * Realistically, the log should never be smaller than 64MB.  Studies by the
@@ -28,7 +29,7 @@
  * latency of the xlog grant head waitqueue when running a heavy metadata
  * update workload when the log size is at least 64MB.
  */
-#define XFS_MIN_REALISTIC_LOG_BLOCKS(blog)     (MEGABYTES(64, (blog)))
+#define XFS_MIN_REALISTIC_LOG_BLOCKS(blog)     (MEGABLOCKS(64, (blog)))
 
 /*
  * Use this macro before we have superblock and mount structure to
@@ -3443,7 +3444,7 @@ validate_supported(
         *
         * 64MB * (8 / 7) * 4 = 293MB
         */
-       if (mp->m_sb.sb_dblocks < MEGABYTES(300, mp->m_sb.sb_blocklog)) {
+       if (mp->m_sb.sb_dblocks < MEGABLOCKS(300, mp->m_sb.sb_blocklog)) {
                fprintf(stderr,
  _("Filesystem must be larger than 300MB.\n"));
                usage();
@@ -3559,7 +3560,7 @@ _("%s: Volume reports invalid stripe unit (%d) and stripe width (%d), ignoring.\
                                BBTOB(ft->data.sunit), BBTOB(ft->data.swidth));
                        ft->data.sunit = 0;
                        ft->data.swidth = 0;
-               } else if (cfg->dblocks < GIGABYTES(1, cfg->blocklog)) {
+               } else if (cfg->dblocks < GIGABLOCKS(1, cfg->blocklog)) {
                        /*
                         * Don't use automatic stripe detection if the device
                         * size is less than 1GB because the performance gains
@@ -4056,7 +4057,7 @@ calc_concurrency_ag_geometry(
         */
        try_threads = nr_threads;
        try_agsize = cfg->dblocks / try_threads;
-       if (try_agsize < GIGABYTES(4, cfg->blocklog)) {
+       if (try_agsize < GIGABLOCKS(4, cfg->blocklog)) {
                do {
                        try_threads--;
                        if (try_threads <= def_agcount) {
@@ -4065,7 +4066,7 @@ calc_concurrency_ag_geometry(
                        }
 
                        try_agsize = cfg->dblocks / try_threads;
-               } while (try_agsize < GIGABYTES(4, cfg->blocklog));
+               } while (try_agsize < GIGABLOCKS(4, cfg->blocklog));
                goto out;
        }
 
@@ -4413,7 +4414,7 @@ calc_concurrency_rtgroup_geometry(
         */
        try_threads = nr_threads;
        try_rgsize = cfg->rtblocks / try_threads;
-       if (try_rgsize < GIGABYTES(4, cfg->blocklog)) {
+       if (try_rgsize < GIGABLOCKS(4, cfg->blocklog)) {
                do {
                        try_threads--;
                        if (try_threads <= def_rgcount) {
@@ -4422,7 +4423,7 @@ calc_concurrency_rtgroup_geometry(
                        }
 
                        try_rgsize = cfg->rtblocks / try_threads;
-               } while (try_rgsize < GIGABYTES(4, cfg->blocklog));
+               } while (try_rgsize < GIGABLOCKS(4, cfg->blocklog));
                goto out;
        }
 
@@ -4516,7 +4517,7 @@ _("rgsize (%s) not a multiple of fs blk size (%d)\n"),
                 * If nobody specified a realtime device or the rtgroup size,
                 * try 1TB, rounded down to the nearest rt extent.
                 */
-               cfg->rgsize = TERABYTES(1, cfg->blocklog);
+               cfg->rgsize = TERABLOCKS(1, cfg->blocklog);
                cfg->rgsize -= cfg->rgsize % cfg->rtextblocks;
                cfg->rgcount = 0;
        } else if (cfg->rtblocks < cfg->rtextblocks * 2) {
@@ -4651,7 +4652,7 @@ _("rgsize (%s) not a multiple of fs blk size (%d)\n"),
                                        (cfg->rtblocks % cfg->rgcount != 0);
                } else {
                        /* 256MB zones just like typical SMR HDDs */
-                       cfg->rgsize = MEGABYTES(256, cfg->blocklog);
+                       cfg->rgsize = MEGABLOCKS(256, cfg->blocklog);
                        cfg->rgcount = cfg->rtblocks / cfg->rgsize +
                                        (cfg->rtblocks % cfg->rgsize != 0);
                }
@@ -4692,9 +4693,9 @@ calculate_imaxpct(
         *  - under  1 TB, use XFS_DFL_IMAXIMUM_PCT (25%).
         */
 
-       if (cfg->dblocks < TERABYTES(1, cfg->blocklog))
+       if (cfg->dblocks < TERABLOCKS(1, cfg->blocklog))
                cfg->imaxpct = XFS_DFL_IMAXIMUM_PCT;
-       else if (cfg->dblocks < TERABYTES(50, cfg->blocklog))
+       else if (cfg->dblocks < TERABLOCKS(50, cfg->blocklog))
                cfg->imaxpct = 5;
        else
                cfg->imaxpct = 1;
@@ -5016,7 +5017,7 @@ calc_concurrency_logblocks(
         * If this filesystem is smaller than a gigabyte, there's little to be
         * gained from making the log larger.
         */
-       if (cfg->dblocks < GIGABYTES(1, cfg->blocklog))
+       if (cfg->dblocks < GIGABLOCKS(1, cfg->blocklog))
                goto out;
 
        /*
@@ -5279,7 +5280,7 @@ _("max log size %d smaller than min log size %d, filesystem is too small\n"),
                                XFS_MIN_REALISTIC_LOG_BLOCKS(cfg->blocklog));
 
                /* And for a tiny filesystem, use the absolute minimum size */
-               if (cfg->dblocks < MEGABYTES(300, cfg->blocklog))
+               if (cfg->dblocks < MEGABLOCKS(300, cfg->blocklog))
                        cfg->logblocks = min_logblocks;
 
                /* Ensure the chosen size fits within log size requirements */