From 5c46463d400034c85433383cbd4df49ff3a54f22 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Wed, 27 Sep 2006 01:50:50 -0700
Subject: [PATCH] --- yaml --- r: 36198 b: refs/heads/master c:
 36b756f2b5762e6d5acba0c18e75cb5c11f11c1b h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/fs/reiserfs/super.c | 21 ++-------------------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index d84e95f8cb18..53f6f6339a26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba52de123d454b57369f291348266d86f4b35070
+refs/heads/master: 36b756f2b5762e6d5acba0c18e75cb5c11f11c1b
diff --git a/trunk/fs/reiserfs/super.c b/trunk/fs/reiserfs/super.c
index 1cd4d387f690..b40d4d64d598 100644
--- a/trunk/fs/reiserfs/super.c
+++ b/trunk/fs/reiserfs/super.c
@@ -723,12 +723,6 @@ static const arg_desc_t error_actions[] = {
 	{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
@@ -957,19 +951,8 @@ static int reiserfs_parse_options(struct super_block *s, char *options,	/* strin
 		}
 
 		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') {