aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-09-27 04:50:50 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-27 11:26:18 -0400
commit36b756f2b5762e6d5acba0c18e75cb5c11f11c1b (patch)
tree493c0592acbb8899b5a2f57237ffe57d442ca4ea
parentba52de123d454b57369f291348266d86f4b35070 (diff)
[PATCH] reiserfs: warn about the useless nolargeio option
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@stusta.de> Cc: Jeff Mahoney <jeffm@suse.com> Cc: Chris Mason <mason@suse.com> Cc: Hans Reiser <reiser@namesys.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/reiserfs/super.c21
1 files changed, 2 insertions, 19 deletions
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 1cd4d387f690..b40d4d64d598 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -723,12 +723,6 @@ static const arg_desc_t error_actions[] = {
723 {NULL, 0, 0}, 723 {NULL, 0, 0},
724}; 724};
725 725
726int reiserfs_default_io_size = 128 * 1024; /* Default recommended I/O size is 128k.
727 There might be broken applications that are
728 confused by this. Use nolargeio mount option
729 to get usual i/o size = PAGE_SIZE.
730 */
731
732/* proceed only one option from a list *cur - string containing of mount options 726/* proceed only one option from a list *cur - string containing of mount options
733 opts - array of options which are accepted 727 opts - array of options which are accepted
734 opt_arg - if option is found and requires an argument and if it is specifed 728 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
957 } 951 }
958 952
959 if (c == 'w') { 953 if (c == 'w') {
960 char *p = NULL; 954 reiserfs_warning(s, "reiserfs: nolargeio option is no longer supported");
961 int val = simple_strtoul(arg, &p, 0); 955 return 0;
962
963 if (*p != '\0') {
964 reiserfs_warning(s,
965 "reiserfs_parse_options: non-numeric value %s for nolargeio option",
966 arg);
967 return 0;
968 }
969 if (val)
970 reiserfs_default_io_size = PAGE_SIZE;
971 else
972 reiserfs_default_io_size = 128 * 1024;
973 } 956 }
974 957
975 if (c == 'j') { 958 if (c == 'j') {