[PATCH] fuse: more flexible caching

Make data caching behavior selectable on a per-open basis instead of
per-mount.  Compatibility for the old mount options 'kernel_cache' and
'direct_io' is retained in the userspace library (version 2.4.0-pre1 or
later).

Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 0 insertions, 16 deletions

diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 652c9d5df973..8dc66760b41a 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -257,8 +257,6 @@ enum {
         OPT_GROUP_ID,
         OPT_DEFAULT_PERMISSIONS,
         OPT_ALLOW_OTHER,
-        OPT_KERNEL_CACHE,
-        OPT_DIRECT_IO,
         OPT_MAX_READ,
         OPT_ERR
 };
@@ -270,8 +268,6 @@ static match_table_t tokens = {
         {OPT_GROUP_ID,                  "group_id=%u"},
         {OPT_DEFAULT_PERMISSIONS,       "default_permissions"},
         {OPT_ALLOW_OTHER,               "allow_other"},
-        {OPT_KERNEL_CACHE,              "kernel_cache"},
-        {OPT_DIRECT_IO,                 "direct_io"},
         {OPT_MAX_READ,                  "max_read=%u"},
         {OPT_ERR,                       NULL}
 };
@@ -327,14 +323,6 @@ static int parse_fuse_opt(char *opt, struct fuse_mount_data *d)
                         d->flags |= FUSE_ALLOW_OTHER;
                         break;
 
-                case OPT_KERNEL_CACHE:
-                        d->flags |= FUSE_KERNEL_CACHE;
-                        break;
-
-                case OPT_DIRECT_IO:
-                        d->flags |= FUSE_DIRECT_IO;
-                        break;
-
                 case OPT_MAX_READ:
                         if (match_int(&args[0], &value))
                                 return 0;
@@ -363,10 +351,6 @@ static int fuse_show_options(struct seq_file *m, struct vfsmount *mnt)
                 seq_puts(m, ",default_permissions");
         if (fc->flags & FUSE_ALLOW_OTHER)
                 seq_puts(m, ",allow_other");
-        if (fc->flags & FUSE_KERNEL_CACHE)
-                seq_puts(m, ",kernel_cache");
-        if (fc->flags & FUSE_DIRECT_IO)
-                seq_puts(m, ",direct_io");
         if (fc->max_read != ~0)
                 seq_printf(m, ",max_read=%u", fc->max_read);
         return 0;