[-mm patch] reiserfs: warn about the useless nolargeio option

[Adrian Bunk]

On Mon, Jul 03, 2006 at 03:03:55AM -0700, Andrew Morton wrote:
>...
> Changes since 2.6.17-mm5:
>...
> +inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default.patch
>...
>  Misc updates.
>...

Since the nolargeio option no longer has any effect, print a warning 
instead of setting a write-only variable.

Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

---

 fs/reiserfs/super.c |   21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

--- linux-2.6.17-mm6-full/fs/reiserfs/super.c.old	2006-07-06 21:48:48.000000000 +0200
+++ linux-2.6.17-mm6-full/fs/reiserfs/super.c	2006-07-06 21:51:48.000000000 +0200
@@ -721,12 +721,6 @@
 	{NULL, 0, 0},
 };
 
-int reiserfs_default_io_size = 128 * 1024;	/* Default recommended I/O size is 128k.
-						   There might be broken applications that are
-						   confused by this. Use nolargeio mount option
-						   to get usual i/o size = PAGE_SIZE.
-						 */
-
 /* proceed only one option from a list *cur - string containing of mount options
    opts - array of options which are accepted
    opt_arg - if option is found and requires an argument and if it is specifed
@@ -955,19 +949,8 @@
 		}
 
 		if (c == 'w') {
-			char *p = NULL;
-			int val = simple_strtoul(arg, &p, 0);
-
-			if (*p != '\0') {
-				reiserfs_warning(s,
-						 "reiserfs_parse_options: non-numeric value %s for nolargeio option",
-						 arg);
-				return 0;
-			}
-			if (val)
-				reiserfs_default_io_size = PAGE_SIZE;
-			else
-				reiserfs_default_io_size = 128 * 1024;
+			reiserfs_warning(s, "reiserfs: nolargeio option is no longer supported");
+			return 0;
 		}
 
 		if (c == 'j') {

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/