From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 22 Nov 2010 21:33:39 +0000 (-0500)
Subject: Merge branch 'maint'
X-Git-Tag: v1.41.90.wc1~28^2~5
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=f35c7b55946788a4e3a9c9a73885e9a2e6e045e4;p=tools%2Fe2fsprogs.git

Merge branch 'maint'
---

f35c7b55946788a4e3a9c9a73885e9a2e6e045e4
diff --cc misc/mke2fs.c
index 0980045,9a7e287..01ad9bf
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@@ -1632,12 -1701,9 +1652,11 @@@ static void PRS(int argc, char *argv[]
  		if ((blocksize < 0) && (use_bsize < (-blocksize)))
  			use_bsize = -blocksize;
  		blocksize = use_bsize;
 -		fs_param.s_blocks_count /= blocksize / 1024;
 +		ext2fs_blocks_count_set(&fs_param,
 +					ext2fs_blocks_count(&fs_param) /
 +					(blocksize / 1024));
  	} else {
- 		if (blocksize < lsector_size ||			/* Impossible */
- 		    (!force && (blocksize < psector_size))) {	/* Suboptimal */
+ 		if (blocksize < lsector_size) {			/* Impossible */
  			com_err(program_name, EINVAL,
  				_("while setting blocksize; too small "
  				  "for device\n"));