The patch titled reiserfs: warn about the useless nolargeio option has been removed from the -mm tree. Its filename is reiserfs-warn-about-the-useless-nolargeio-option.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ 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 file 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 @@ -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 } 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 origin.patch git-drm.patch git-dvb.patch git-gfs2.patch git-ieee1394.patch git-input.patch git-pcmcia.patch drivers-net-pcmcia-xirc2ps_csc-remove-unused-label.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_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 acx1xx-wireless-driver.patch drivers-edac-make-code-static.patch drivers-char-scx200_gpioc-make-code-static.patch drivers-char-pc8736x_gpioc-remove-unused-static-functions.patch fix-conflict-with-the-is_init-identifier-on-parisc.patch cpuset-top_cpuset-tracks-hotplug-changes-to-node_online_map-fix-2.patch build-sound-sound_firmwarec-only-for-oss.patch kernel-time-ntpc-possible-cleanups.patch generic-ioremap_page_range-implementation-fix.patch generic-ioremap_page_range-i386-conversion-fix.patch fs-ecryptfs-possible-cleanups.patch ecryptfs-add-a-maintainers-entry.patch make-kernel-sysctlc_proc_do_string-static.patch namespaces-utsname-sysctl-hack.patch namespaces-utsname-implement-clone_newuts-flag.patch rename-the-provided-execve-functions-to-kernel_execve-fixes.patch provide-kernel_execve-on-all-architectures-m68knommu-fix.patch fs-reiser4-possible-cleanups.patch reiser4-possible-cleanups-2.patch drivers-ide-cleanups.patch atyfb-possible-cleanups.patch fbcon-make-3-functions-static.patch vt-proper-prototypes-for-some-console-functions.patch md-the-scheduled-removal-of-the-start_array-ioctl-for-md.patch srcu-3-add-srcu-operations-to-rcutorture-fix.patch rcu-add-fake-writers-to-rcutorture-tidy.patch the-scheduled-removal-of-some-oss-drivers.patch the-scheduled-removal-of-some-oss-drivers-fix.patch the-scheduled-removal-of-some-oss-drivers-fix-fix.patch kill-sound-oss-_symsc.patch slab-cache-shrinker-statistics.patch debug-shared-irqs-kconfig-fix.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