The patch titled reiserfs: warn about the useless nolargeio option has been added to the -mm tree. Its filename is reiserfs-warn-about-the-useless-nolargeio-option.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: reiserfs: warn about the useless nolargeio option From: Adrian Bunk <bunk@xxxxxxxxx> 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> Cc: Jeff Mahoney <jeffm@xxxxxxxx> Cc: Chris Mason <mason@xxxxxxxx> Cc: Hans Reiser <reiser@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- fs/reiserfs/super.c | 21 ++------------------- 1 files changed, 2 insertions(+), 19 deletions(-) diff -puN fs/reiserfs/super.c~reiserfs-warn-about-the-useless-nolargeio-option fs/reiserfs/super.c --- a/fs/reiserfs/super.c~reiserfs-warn-about-the-useless-nolargeio-option +++ a/fs/reiserfs/super.c @@ -725,12 +725,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 @@ -959,19 +953,8 @@ static int reiserfs_parse_options(struct } 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') { _ Patches currently in -mm which might be from bunk@xxxxxxxxx are kernel-printkc-export_symbol_unused.patch mm-bootmemc-export_unused_symbol.patch mm-memoryc-export_unused_symbol.patch mm-mmzonec-export_unused_symbol.patch fs-read_writec-export_unused_symbol.patch kernel-softirqc-export_unused_symbol.patch git-alsa.patch git-gfs2.patch if-0-drivers-usb-input-hid-corechid_find_field_by_usage.patch make-variables-static-after-klibc-merge.patch git-libata-all.patch fs-nfs-make-2-functions-static.patch git-pcmcia.patch gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch drivers-scsi-aic7xxx-possible-cleanups.patch drivers-scsi-small-cleanups.patch drivers-scsi-qla2xxx-make-some-functions-static.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch drivers-scsi-aic7xxx-possible-cleanups-2.patch drivers-scsi-advansysc-cleanups.patch make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch megaraid-fix-warnings-when-config_proc_fs=n.patch drivers-scsi-arcmsr-cleanups.patch mm-make-functions-static.patch acx1xx-wireless-driver.patch drivers-edac-make-code-static.patch inode-diet-eliminate-i_blksize-and-use-a-per-superblock-default-fix.patch reiserfs-warn-about-the-useless-nolargeio-option.patch task-watchers-register-semundo-task-watcher.patch fs-ecryptfs-possible-cleanups.patch ecryptfs-add-a-maintainers-entry.patch make-kernel-sysctlc_proc_do_string-static.patch namespaces-utsname-implement-clone_newuts-flag.patch fs-reiser4-possible-cleanups.patch the-scheduled-removal-of-some-oss-drivers.patch slab-cache-shrinker-statistics.patch i386-enable-4k-stacks-by-default.patch mutex-subsystem-synchro-test-module.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html