diff options
Diffstat (limited to 'fs/reiserfs/super.c')
| -rw-r--r-- | fs/reiserfs/super.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 5567328f1041..b40d4d64d598 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c | |||
| @@ -530,9 +530,7 @@ static int init_inodecache(void) | |||
| 530 | 530 | ||
| 531 | static void destroy_inodecache(void) | 531 | static void destroy_inodecache(void) |
| 532 | { | 532 | { |
| 533 | if (kmem_cache_destroy(reiserfs_inode_cachep)) | 533 | kmem_cache_destroy(reiserfs_inode_cachep); |
| 534 | reiserfs_warning(NULL, | ||
| 535 | "reiserfs_inode_cache: not all structures were freed"); | ||
| 536 | } | 534 | } |
| 537 | 535 | ||
| 538 | /* we don't mark inodes dirty, we just log them */ | 536 | /* we don't mark inodes dirty, we just log them */ |
| @@ -725,12 +723,6 @@ static const arg_desc_t error_actions[] = { | |||
| 725 | {NULL, 0, 0}, | 723 | {NULL, 0, 0}, |
| 726 | }; | 724 | }; |
| 727 | 725 | ||
| 728 | int reiserfs_default_io_size = 128 * 1024; /* Default recommended I/O size is 128k. | ||
| 729 | There might be broken applications that are | ||
| 730 | confused by this. Use nolargeio mount option | ||
| 731 | to get usual i/o size = PAGE_SIZE. | ||
| 732 | */ | ||
| 733 | |||
| 734 | /* 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 |
| 735 | opts - array of options which are accepted | 727 | opts - array of options which are accepted |
| 736 | 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 |
| @@ -959,19 +951,8 @@ static int reiserfs_parse_options(struct super_block *s, char *options, /* strin | |||
| 959 | } | 951 | } |
| 960 | 952 | ||
| 961 | if (c == 'w') { | 953 | if (c == 'w') { |
| 962 | char *p = NULL; | 954 | reiserfs_warning(s, "reiserfs: nolargeio option is no longer supported"); |
| 963 | int val = simple_strtoul(arg, &p, 0); | 955 | return 0; |
| 964 | |||
| 965 | if (*p != '\0') { | ||
| 966 | reiserfs_warning(s, | ||
| 967 | "reiserfs_parse_options: non-numeric value %s for nolargeio option", | ||
| 968 | arg); | ||
| 969 | return 0; | ||
| 970 | } | ||
| 971 | if (val) | ||
| 972 | reiserfs_default_io_size = PAGE_SIZE; | ||
| 973 | else | ||
| 974 | reiserfs_default_io_size = 128 * 1024; | ||
| 975 | } | 956 | } |
| 976 | 957 | ||
| 977 | if (c == 'j') { | 958 | if (c == 'j') { |
