Drop -o large_read mount option

This was only relevant for 2.4 kernels. Fixes #92.

diff --git a/ChangeLog.rst b/ChangeLog.rst
index d18fc3e9e71e481ed807029535ab646b13a2a4b3..99e548ad4a12ef3647b36208997201aa993b20f2 100644 (file)
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,6 +1,9 @@
 Unreleased Changes
 ==================
 
+* The ``-o large_read`` mount option has been dropped. Hopefully no
+  one uses a Linux 2.4 kernel anymore.
+
 * The chmod, chown, truncate, utimens and getattr handlers of the
   high-level API now all receive an additional struct fuse_file_info
   pointer. This pointer is NULL if the file is not currently open.

diff --git a/doc/mount.fuse.8 b/doc/mount.fuse.8
index 88dd3f4d14b8f67fcedad0363574716a2239c09d..6c2657858b28a09dc8c766858be0142de18da4e7 100644 (file)
--- a/doc/mount.fuse.8
+++ b/doc/mount.fuse.8
@@ -33,8 +33,6 @@ This option disables flushing the cache of the file contents on every \fBopen\fP
 \fBauto_cache\fP
 This option enables automatic flushing of the data cache on \fBopen\fP(2). The cache will only be flushed if the modification time or the size of the file has changed.
 .TP
-\fBlarge_read\fP
-Issue large read requests.  This can improve performance for some filesystems, but can also degrade performance. This option is only useful on 2.4.X kernels, as on 2.6 kernels requests size is automatically determined for optimum performance.
 .TP
 \fBdirect_io\fP
 This option disables the use of page cache (file content cache) in the kernel for this filesystem. This has several affects:

diff --git a/lib/mount.c b/lib/mount.c
index 386260cd7d2e5dddde84d8ad8aa10f64b5a1c99e..45ac60a119144a12d95acbc8169a9178e4eff234 100644 (file)
--- a/lib/mount.c
+++ b/lib/mount.c
@@ -93,7 +93,6 @@ static const struct fuse_opt fuse_mount_opts[] = {
        FUSE_OPT_KEY("blkdev",                  KEY_FUSERMOUNT_OPT),
        FUSE_OPT_KEY("fsname=",                 KEY_FUSERMOUNT_OPT),
        FUSE_OPT_KEY("subtype=",                KEY_SUBTYPE_OPT),
-       FUSE_OPT_KEY("large_read",              KEY_KERN_OPT),
        FUSE_OPT_KEY("blksize=",                KEY_KERN_OPT),
        FUSE_OPT_KEY("default_permissions",     KEY_KERN_OPT),
        FUSE_OPT_KEY("context=",                KEY_KERN_OPT),
@@ -130,7 +129,6 @@ void fuse_mount_help(void)
 "    -o default_permissions enable permission checking by kernel\n"
 "    -o fsname=NAME         set filesystem name\n"
 "    -o subtype=NAME        set filesystem type\n"
-"    -o large_read          issue large read requests (2.4 only)\n"
 "    -o max_read=N          set maximum size of read requests\n\n");
 }
 

diff --git a/lib/mount_bsd.c b/lib/mount_bsd.c
index bc3ed89fdc3a3d110f6d83c6ab8e78f96354357c..c838fcf10996f6ab9bdff9c757ec88c45983cdfd 100644 (file)
--- a/lib/mount_bsd.c
+++ b/lib/mount_bsd.c
@@ -91,7 +91,6 @@ static const struct fuse_opt fuse_mount_opts[] = {
         */
        FUSE_OPT_KEY("fsname=",                 KEY_KERN),
        FUSE_OPT_KEY("nonempty",                KEY_KERN),
-       FUSE_OPT_KEY("large_read",              KEY_KERN),
        FUSE_OPT_END
 };