[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>
This commit is contained in:
committed by
Linus Torvalds
parent
ba52de123d
commit
36b756f2b5
@@ -723,12 +723,6 @@ static const arg_desc_t error_actions[] = {
|
|||||||
{NULL, 0, 0},
|
{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
|
/* proceed only one option from a list *cur - string containing of mount options
|
||||||
opts - array of options which are accepted
|
opts - array of options which are accepted
|
||||||
opt_arg - if option is found and requires an argument and if it is specifed
|
opt_arg - if option is found and requires an argument and if it is specifed
|
||||||
@@ -957,20 +951,9 @@ static int reiserfs_parse_options(struct super_block *s, char *options, /* strin
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (c == 'w') {
|
if (c == 'w') {
|
||||||
char *p = NULL;
|
reiserfs_warning(s, "reiserfs: nolargeio option is no longer supported");
|
||||||
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;
|
return 0;
|
||||||
}
|
}
|
||||||
if (val)
|
|
||||||
reiserfs_default_io_size = PAGE_SIZE;
|
|
||||||
else
|
|
||||||
reiserfs_default_io_size = 128 * 1024;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (c == 'j') {
|
if (c == 'j') {
|
||||||
if (arg && *arg && jdev_name) {
|
if (arg && *arg && jdev_name) {
|
||||||
|
Reference in New Issue
Block a user