Patchwork [1/2,v4] e2fsprogs: Fix how we treat user-spcified filesystem size

login
register
mail settings
Submitter Lukas Czerner
Date June 5, 2011, 10:30 a.m.
Message ID <1307269845-15062-1-git-send-email-lczerner@redhat.com>
Download mbox | patch
Permalink /patch/98756/
State Rejected
Headers show

Comments

Lukas Czerner - June 5, 2011, 10:30 a.m.
mke2fs and resize2fs allows specifying filesystem size as a parameter,
former called as blocks-count. However it has been a little bit messy so
this commit fixes it mainly by updating man pages.

We can not specify filesystem size in blocks count without specifying
blocksize as well. It is because we need blocks count to determine
filesystem type, and we need filesystem type to determine blocksize. So
it should not be allowed, however due to compatibility reason it should
be still possible, so at least print warning message for now, so we can
easily restrict that later.

Filesystem size can be specified using units as suffixes. This was not
documented for mke2fs, so this commits adds proper documentation into
mke2fs man page.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
---
[v2]: do not spell units - mebibytes etc... - but rather use just abbrev.
[v3]: Change some phrasing in man pages, mainly with the help from Eric Sandeen
[v4]: Remove 'b' unit designator.
 lib/e2p/parse_num.c   |    1 -
 misc/mke2fs.8.in      |   34 ++++++++++++++++++++++++++++------
 resize/resize2fs.8.in |   23 ++++++++---------------
 3 files changed, 36 insertions(+), 22 deletions(-)
Lukas Czerner - Aug. 11, 2011, 3:02 p.m.
On Sun, 5 Jun 2011, Lukas Czerner wrote:

> mke2fs and resize2fs allows specifying filesystem size as a parameter,
> former called as blocks-count. However it has been a little bit messy so
> this commit fixes it mainly by updating man pages.
> 
> We can not specify filesystem size in blocks count without specifying
> blocksize as well. It is because we need blocks count to determine
> filesystem type, and we need filesystem type to determine blocksize. So
> it should not be allowed, however due to compatibility reason it should
> be still possible, so at least print warning message for now, so we can
> easily restrict that later.
> 
> Filesystem size can be specified using units as suffixes. This was not
> documented for mke2fs, so this commits adds proper documentation into
> mke2fs man page.

Hi Ted,

any chance merging that ?

Thanks!
-Lukas

> 
> Signed-off-by: Lukas Czerner <lczerner@redhat.com>
> Reviewed-by: Eric Sandeen <sandeen@redhat.com>
> ---
> [v2]: do not spell units - mebibytes etc... - but rather use just abbrev.
> [v3]: Change some phrasing in man pages, mainly with the help from Eric Sandeen
> [v4]: Remove 'b' unit designator.
>  lib/e2p/parse_num.c   |    1 -
>  misc/mke2fs.8.in      |   34 ++++++++++++++++++++++++++++------
>  resize/resize2fs.8.in |   23 ++++++++---------------
>  3 files changed, 36 insertions(+), 22 deletions(-)
> 
> diff --git a/lib/e2p/parse_num.c b/lib/e2p/parse_num.c
> index 83a329a..8e2751b 100644
> --- a/lib/e2p/parse_num.c
> +++ b/lib/e2p/parse_num.c
> @@ -37,7 +37,6 @@ unsigned long long parse_num_blocks2(const char *arg, int log_block_size)
>  		num >>= (1+log_block_size);
>  		break;
>  	case '\0':
> -		break;
>  	default:
>  		return 0;
>  	}
> diff --git a/misc/mke2fs.8.in b/misc/mke2fs.8.in
> index 4a3b0c3..f315910 100644
> --- a/misc/mke2fs.8.in
> +++ b/misc/mke2fs.8.in
> @@ -108,7 +108,7 @@ mke2fs \- create an ext2/ext3/ext4 filesystem
>  ]
>  .I device
>  [
> -.I blocks-count
> +.I filesystem-size
>  ]
>  @JDEV@.sp
>  @JDEV@.B "mke2fs \-O journal_dev"
> @@ -136,7 +136,7 @@ mke2fs \- create an ext2/ext3/ext4 filesystem
>  @JDEV@]
>  @JDEV@.I external-journal
>  @JDEV@[
> -@JDEV@.I blocks-count
> +@JDEV@.I filesystem-size
>  @JDEV@]
>  .SH DESCRIPTION
>  .B mke2fs
> @@ -145,10 +145,32 @@ partition.
>  .I device
>  is the special file corresponding to the device (e.g
>  .IR /dev/hdXX ).
> -.I blocks-count
> -is the number of blocks on the device.  If omitted,
> -.B mke2fs
> -automagically figures the file system size.  If called as
> +.I filesystem-size
> +is the size of the filesystem you want to create. Optionally, the
> +.I filesystem-size
> +parameter may be suffixed by one of the following unit
> +designators: 's', 'K', 'M', 'G', or 'T',
> +for  512 byte sectors, KiB (2^10 Bytes), MiB (2^20 Bytes),
> +GiB (2^30 Bytes), or TiB (2^40 Bytes) respectively, which are binary (power-of-2),
> +not decimal, units. If no units are specified, then the
> +.I filesystem-size
> +parameter shall specify the number of filesystem blocks.
> +Note that you should not specify
> +.I filesystem-size
> +in block units (or without any units at all) without also specifying block
> +size with the
> +.B \-b
> +option. This will be allowed for now due to compatibility reasons,
> +however it may be restricted in the future. For now, 1024-byte blocks will
> +be assumed in this case, regardless of the filesystem blocksize ultimately
> +chosen by mke2fs.
> +The
> +.I filesystem-size
> +may never be larger than the size of the partition.
> +If the
> +.I filesystem-size
> +parameter is not specified, it will default to the size of the partition.
> +If called as
>  .B mkfs.ext3
>  a journal is created as if the
>  .B \-j
> diff --git a/resize/resize2fs.8.in b/resize/resize2fs.8.in
> index e02345d..0f4153c 100644
> --- a/resize/resize2fs.8.in
> +++ b/resize/resize2fs.8.in
> @@ -36,29 +36,22 @@ filesystems mounted using ext3 and ext4.).
>  The 
>  .I size
>  parameter specifies the requested new size of the filesystem.
> -If no units are specified, the units of the
> -.I size
> -parameter shall be the filesystem blocksize of the filesystem.
>  Optionally, the 
>  .I size
> -parameter may be suffixed by one of the following the units 
> -designators: 's', 'K', 'M', or 'G',
> -for 512 byte sectors, kilobytes, megabytes, or gigabytes, respectively.
> -The 
> +parameter may be suffixed by one of the following the unit
> +designators: 's', 'K', 'M', 'G', or 'T',
> +for 512 byte sectors, KiB (2^10 Bytes), MiB (2^20 Bytes),
> +GiB (2^30 Bytes), or TiB (2^40 Bytes) respectively, which are binary (power-of-2),
> +not decimal, units.
> +If no units are specified, then the
> +.I size
> +parameter shall specify the number of filesystem blocks. The
>  .I size
>  of the filesystem may never be larger than the size of the partition.
>  If 
>  .I size
>  parameter is not specified, it will default to the size of the partition.
>  .PP
> -Note: when kilobytes is used above, I mean
> -.IR real ,
> -power-of-2 kilobytes, (i.e., 1024 bytes), which some politically correct
> -folks insist should be the stupid-sounding ``kibibytes''.  The same
> -holds true for megabytes, also sometimes known as ``mebibytes'', or
> -gigabytes, as the amazingly silly ``gibibytes''.  Makes you want to
> -gibber, doesn't it?
> -.PP
>  The
>  .B resize2fs
>  program does not manipulate the size of partitions.  If you wish to enlarge
>
Lukas Czerner - Sept. 1, 2011, 8:38 a.m.
On Thu, 11 Aug 2011, Lukas Czerner wrote:

> On Sun, 5 Jun 2011, Lukas Czerner wrote:
> 
> > mke2fs and resize2fs allows specifying filesystem size as a parameter,
> > former called as blocks-count. However it has been a little bit messy so
> > this commit fixes it mainly by updating man pages.
> > 
> > We can not specify filesystem size in blocks count without specifying
> > blocksize as well. It is because we need blocks count to determine
> > filesystem type, and we need filesystem type to determine blocksize. So
> > it should not be allowed, however due to compatibility reason it should
> > be still possible, so at least print warning message for now, so we can
> > easily restrict that later.
> > 
> > Filesystem size can be specified using units as suffixes. This was not
> > documented for mke2fs, so this commits adds proper documentation into
> > mke2fs man page.
> 
> Hi Ted,
> 
> any chance merging that ?
> 
> Thanks!
> -Lukas

ping^2

> 
> > 
> > Signed-off-by: Lukas Czerner <lczerner@redhat.com>
> > Reviewed-by: Eric Sandeen <sandeen@redhat.com>
> > ---
> > [v2]: do not spell units - mebibytes etc... - but rather use just abbrev.
> > [v3]: Change some phrasing in man pages, mainly with the help from Eric Sandeen
> > [v4]: Remove 'b' unit designator.
> >  lib/e2p/parse_num.c   |    1 -
> >  misc/mke2fs.8.in      |   34 ++++++++++++++++++++++++++++------
> >  resize/resize2fs.8.in |   23 ++++++++---------------
> >  3 files changed, 36 insertions(+), 22 deletions(-)
> > 
> > diff --git a/lib/e2p/parse_num.c b/lib/e2p/parse_num.c
> > index 83a329a..8e2751b 100644
> > --- a/lib/e2p/parse_num.c
> > +++ b/lib/e2p/parse_num.c
> > @@ -37,7 +37,6 @@ unsigned long long parse_num_blocks2(const char *arg, int log_block_size)
> >  		num >>= (1+log_block_size);
> >  		break;
> >  	case '\0':
> > -		break;
> >  	default:
> >  		return 0;
> >  	}
> > diff --git a/misc/mke2fs.8.in b/misc/mke2fs.8.in
> > index 4a3b0c3..f315910 100644
> > --- a/misc/mke2fs.8.in
> > +++ b/misc/mke2fs.8.in
> > @@ -108,7 +108,7 @@ mke2fs \- create an ext2/ext3/ext4 filesystem
> >  ]
> >  .I device
> >  [
> > -.I blocks-count
> > +.I filesystem-size
> >  ]
> >  @JDEV@.sp
> >  @JDEV@.B "mke2fs \-O journal_dev"
> > @@ -136,7 +136,7 @@ mke2fs \- create an ext2/ext3/ext4 filesystem
> >  @JDEV@]
> >  @JDEV@.I external-journal
> >  @JDEV@[
> > -@JDEV@.I blocks-count
> > +@JDEV@.I filesystem-size
> >  @JDEV@]
> >  .SH DESCRIPTION
> >  .B mke2fs
> > @@ -145,10 +145,32 @@ partition.
> >  .I device
> >  is the special file corresponding to the device (e.g
> >  .IR /dev/hdXX ).
> > -.I blocks-count
> > -is the number of blocks on the device.  If omitted,
> > -.B mke2fs
> > -automagically figures the file system size.  If called as
> > +.I filesystem-size
> > +is the size of the filesystem you want to create. Optionally, the
> > +.I filesystem-size
> > +parameter may be suffixed by one of the following unit
> > +designators: 's', 'K', 'M', 'G', or 'T',
> > +for  512 byte sectors, KiB (2^10 Bytes), MiB (2^20 Bytes),
> > +GiB (2^30 Bytes), or TiB (2^40 Bytes) respectively, which are binary (power-of-2),
> > +not decimal, units. If no units are specified, then the
> > +.I filesystem-size
> > +parameter shall specify the number of filesystem blocks.
> > +Note that you should not specify
> > +.I filesystem-size
> > +in block units (or without any units at all) without also specifying block
> > +size with the
> > +.B \-b
> > +option. This will be allowed for now due to compatibility reasons,
> > +however it may be restricted in the future. For now, 1024-byte blocks will
> > +be assumed in this case, regardless of the filesystem blocksize ultimately
> > +chosen by mke2fs.
> > +The
> > +.I filesystem-size
> > +may never be larger than the size of the partition.
> > +If the
> > +.I filesystem-size
> > +parameter is not specified, it will default to the size of the partition.
> > +If called as
> >  .B mkfs.ext3
> >  a journal is created as if the
> >  .B \-j
> > diff --git a/resize/resize2fs.8.in b/resize/resize2fs.8.in
> > index e02345d..0f4153c 100644
> > --- a/resize/resize2fs.8.in
> > +++ b/resize/resize2fs.8.in
> > @@ -36,29 +36,22 @@ filesystems mounted using ext3 and ext4.).
> >  The 
> >  .I size
> >  parameter specifies the requested new size of the filesystem.
> > -If no units are specified, the units of the
> > -.I size
> > -parameter shall be the filesystem blocksize of the filesystem.
> >  Optionally, the 
> >  .I size
> > -parameter may be suffixed by one of the following the units 
> > -designators: 's', 'K', 'M', or 'G',
> > -for 512 byte sectors, kilobytes, megabytes, or gigabytes, respectively.
> > -The 
> > +parameter may be suffixed by one of the following the unit
> > +designators: 's', 'K', 'M', 'G', or 'T',
> > +for 512 byte sectors, KiB (2^10 Bytes), MiB (2^20 Bytes),
> > +GiB (2^30 Bytes), or TiB (2^40 Bytes) respectively, which are binary (power-of-2),
> > +not decimal, units.
> > +If no units are specified, then the
> > +.I size
> > +parameter shall specify the number of filesystem blocks. The
> >  .I size
> >  of the filesystem may never be larger than the size of the partition.
> >  If 
> >  .I size
> >  parameter is not specified, it will default to the size of the partition.
> >  .PP
> > -Note: when kilobytes is used above, I mean
> > -.IR real ,
> > -power-of-2 kilobytes, (i.e., 1024 bytes), which some politically correct
> > -folks insist should be the stupid-sounding ``kibibytes''.  The same
> > -holds true for megabytes, also sometimes known as ``mebibytes'', or
> > -gigabytes, as the amazingly silly ``gibibytes''.  Makes you want to
> > -gibber, doesn't it?
> > -.PP
> >  The
> >  .B resize2fs
> >  program does not manipulate the size of partitions.  If you wish to enlarge
> > 
> 
>
Theodore Ts'o - Sept. 3, 2011, 3:10 p.m.
On Sun, Jun 05, 2011 at 12:30:44PM +0200, Lukas Czerner wrote:
> We can not specify filesystem size in blocks count without specifying
> blocksize as well. It is because we need blocks count to determine
> filesystem type, and we need filesystem type to determine blocksize. So
> it should not be allowed, however due to compatibility reason it should
> be still possible, so at least print warning message for now, so we can
> easily restrict that later.

What we currently have is actually very well defined.  The fs-size
parameter is either an absolute size, if a suffixed value (i.e., 12k,
64M, 128G, 2T) is specified.  If the value does not have a suffix,
then it is either interpreted as a block count if a blocksize is
specified, or as kilobytes if no blocksize is explicitly specified.

And this is really only a problem with mke2fs; it's not a problem with
resize2fs, since we know what the blocksize is.

> diff --git a/lib/e2p/parse_num.c b/lib/e2p/parse_num.c
> index 83a329a..8e2751b 100644
> --- a/lib/e2p/parse_num.c
> +++ b/lib/e2p/parse_num.c
> @@ -37,7 +37,6 @@ unsigned long long parse_num_blocks2(const char *arg, int log_block_size)
>  		num >>= (1+log_block_size);
>  		break;
>  	case '\0':
> -		break;
>  	default:
>  		return 0;
>  	}

and this doesn't do what the commit description claims.  This change
actually breaks the use of a number that does not have a suffix.

I'd rather not break resize2fs at all.  If script wants to specify a
block count, that's fine.  If we want to add a warning which gets
printed by mke2fs in the case where there is no explicit blockcount
specified by the user and no explicit size suffix to the fs-size
parameter stating that parameter was interpreted as kilobytes, that's
fine.

Basically, how mke2fs parses that field has been the way it has been
for over a decade, and it's really not caused any problems for users.

    	   	       	    	       - Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Lukas Czerner - Sept. 5, 2011, 11:58 a.m.
On Sat, 3 Sep 2011, Ted Ts'o wrote:

> On Sun, Jun 05, 2011 at 12:30:44PM +0200, Lukas Czerner wrote:
> > We can not specify filesystem size in blocks count without specifying
> > blocksize as well. It is because we need blocks count to determine
> > filesystem type, and we need filesystem type to determine blocksize. So
> > it should not be allowed, however due to compatibility reason it should
> > be still possible, so at least print warning message for now, so we can
> > easily restrict that later.
> 
> What we currently have is actually very well defined.  The fs-size
> parameter is either an absolute size, if a suffixed value (i.e., 12k,
> 64M, 128G, 2T) is specified.  If the value does not have a suffix,
> then it is either interpreted as a block count if a blocksize is
> specified, or as kilobytes if no blocksize is explicitly specified.
> 
> And this is really only a problem with mke2fs; it's not a problem with
> resize2fs, since we know what the blocksize is.
> 
> > diff --git a/lib/e2p/parse_num.c b/lib/e2p/parse_num.c
> > index 83a329a..8e2751b 100644
> > --- a/lib/e2p/parse_num.c
> > +++ b/lib/e2p/parse_num.c
> > @@ -37,7 +37,6 @@ unsigned long long parse_num_blocks2(const char *arg, int log_block_size)
> >  		num >>= (1+log_block_size);
> >  		break;
> >  	case '\0':
> > -		break;
> >  	default:
> >  		return 0;
> >  	}
> 
> and this doesn't do what the commit description claims.  This change
> actually breaks the use of a number that does not have a suffix.
> 
> I'd rather not break resize2fs at all.  If script wants to specify a
> block count, that's fine.  If we want to add a warning which gets
> printed by mke2fs in the case where there is no explicit blockcount
> specified by the user and no explicit size suffix to the fs-size
> parameter stating that parameter was interpreted as kilobytes, that's
> fine.
> 
> Basically, how mke2fs parses that field has been the way it has been
> for over a decade, and it's really not caused any problems for users.
> 
>     	   	       	    	       - Ted
> 

Ok, than. We can drop the patch.

Thanks!
-Lukas
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/lib/e2p/parse_num.c b/lib/e2p/parse_num.c
index 83a329a..8e2751b 100644
--- a/lib/e2p/parse_num.c
+++ b/lib/e2p/parse_num.c
@@ -37,7 +37,6 @@  unsigned long long parse_num_blocks2(const char *arg, int log_block_size)
 		num >>= (1+log_block_size);
 		break;
 	case '\0':
-		break;
 	default:
 		return 0;
 	}
diff --git a/misc/mke2fs.8.in b/misc/mke2fs.8.in
index 4a3b0c3..f315910 100644
--- a/misc/mke2fs.8.in
+++ b/misc/mke2fs.8.in
@@ -108,7 +108,7 @@  mke2fs \- create an ext2/ext3/ext4 filesystem
 ]
 .I device
 [
-.I blocks-count
+.I filesystem-size
 ]
 @JDEV@.sp
 @JDEV@.B "mke2fs \-O journal_dev"
@@ -136,7 +136,7 @@  mke2fs \- create an ext2/ext3/ext4 filesystem
 @JDEV@]
 @JDEV@.I external-journal
 @JDEV@[
-@JDEV@.I blocks-count
+@JDEV@.I filesystem-size
 @JDEV@]
 .SH DESCRIPTION
 .B mke2fs
@@ -145,10 +145,32 @@  partition.
 .I device
 is the special file corresponding to the device (e.g
 .IR /dev/hdXX ).
-.I blocks-count
-is the number of blocks on the device.  If omitted,
-.B mke2fs
-automagically figures the file system size.  If called as
+.I filesystem-size
+is the size of the filesystem you want to create. Optionally, the
+.I filesystem-size
+parameter may be suffixed by one of the following unit
+designators: 's', 'K', 'M', 'G', or 'T',
+for  512 byte sectors, KiB (2^10 Bytes), MiB (2^20 Bytes),
+GiB (2^30 Bytes), or TiB (2^40 Bytes) respectively, which are binary (power-of-2),
+not decimal, units. If no units are specified, then the
+.I filesystem-size
+parameter shall specify the number of filesystem blocks.
+Note that you should not specify
+.I filesystem-size
+in block units (or without any units at all) without also specifying block
+size with the
+.B \-b
+option. This will be allowed for now due to compatibility reasons,
+however it may be restricted in the future. For now, 1024-byte blocks will
+be assumed in this case, regardless of the filesystem blocksize ultimately
+chosen by mke2fs.
+The
+.I filesystem-size
+may never be larger than the size of the partition.
+If the
+.I filesystem-size
+parameter is not specified, it will default to the size of the partition.
+If called as
 .B mkfs.ext3
 a journal is created as if the
 .B \-j
diff --git a/resize/resize2fs.8.in b/resize/resize2fs.8.in
index e02345d..0f4153c 100644
--- a/resize/resize2fs.8.in
+++ b/resize/resize2fs.8.in
@@ -36,29 +36,22 @@  filesystems mounted using ext3 and ext4.).
 The 
 .I size
 parameter specifies the requested new size of the filesystem.
-If no units are specified, the units of the
-.I size
-parameter shall be the filesystem blocksize of the filesystem.
 Optionally, the 
 .I size
-parameter may be suffixed by one of the following the units 
-designators: 's', 'K', 'M', or 'G',
-for 512 byte sectors, kilobytes, megabytes, or gigabytes, respectively.
-The 
+parameter may be suffixed by one of the following the unit
+designators: 's', 'K', 'M', 'G', or 'T',
+for 512 byte sectors, KiB (2^10 Bytes), MiB (2^20 Bytes),
+GiB (2^30 Bytes), or TiB (2^40 Bytes) respectively, which are binary (power-of-2),
+not decimal, units.
+If no units are specified, then the
+.I size
+parameter shall specify the number of filesystem blocks. The
 .I size
 of the filesystem may never be larger than the size of the partition.
 If 
 .I size
 parameter is not specified, it will default to the size of the partition.
 .PP
-Note: when kilobytes is used above, I mean
-.IR real ,
-power-of-2 kilobytes, (i.e., 1024 bytes), which some politically correct
-folks insist should be the stupid-sounding ``kibibytes''.  The same
-holds true for megabytes, also sometimes known as ``mebibytes'', or
-gigabytes, as the amazingly silly ``gibibytes''.  Makes you want to
-gibber, doesn't it?
-.PP
 The
 .B resize2fs
 program does not manipulate the size of partitions.  If you wish to enlarge