xfs
[Top] [All Lists]

[PATCH] mkfs.xfs: print std info if agcount makes agsize out of bounds

To: xfs-oss <xfs@xxxxxxxxxxx>
Subject: [PATCH] mkfs.xfs: print std info if agcount makes agsize out of bounds
From: Eric Sandeen <sandeen@xxxxxxxxxx>
Date: Wed, 28 Mar 2012 15:35:03 -0500
User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:11.0) Gecko/20120313 Thunderbird/11.0
When specifying a too-small agcount with stripe geometry,
mkfs.xfs can fail with a somewhat unexpected message:

$ mkfs.xfs -f -d file,name=fsfile,size=9764864000b,agcount=31,su=512k,sw=20
Allocation group size (314995613) is not a multiple of the stripe unit (128)

This strikes me as especially odd because normally, mkfs.xfs
tries to fix up the agsize to be a stripe multiple.  The only way
we get to the above error message is if ag _size_ is out of bounds;
exiting with an error about alignment rather than about size
seems odd.

Maybe below is too clever, but if by the time we've decided that
agsize is out of bounds after rounding it both up and down,
as necessary, to get to a stripe-width multiple, calling
validate_ag_geometry() will give us the same standard message as
if we had specified no stripe geometry:

$ mkfs/mkfs.xfs -f -d file,name=fsfile,size=9764864000b,agcount=31,su=512k,sw=20
agsize (314995613b) too big, maximum is 268435455 blocks
Usage: mkfs.xfs
...

$ mkfs/mkfs.xfs -f -d file,name=fsfile,size=9764864000b,agcount=31
agsize (314995613b) too big, maximum is 268435455 blocks
Usage: mkfs.xfs
...

Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
---

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 5445b6f..1f829c5 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -2174,9 +2174,12 @@ _("size %s specified for log subvolume is too large, 
maximum is %lld blocks\n"),
                                if (nodsflag) {
                                        dsunit = dswidth = 0;
                                } else {
-                                       fprintf(stderr,
-_("Allocation group size (%lld) is not a multiple of the stripe unit (%d)\n"),
-                                               (long long)agsize, dsunit);
+                                       /*
+                                        * agsize is out of bounds, this will
+                                        * print nice details & exit.
+                                        */
+                                       validate_ag_geometry(blocklog, dblocks,
+                                                           agsize, agcount);
                                        exit(1);
                                }
                        }

<Prev in Thread] Current Thread [Next in Thread>