]> err.no Git - linux-2.6/blobdiff - fs/fuse/inode.c
Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6
[linux-2.6] / fs / fuse / inode.c
index 33fad334ba70e61d9e1ff5db66f68be3672f372d..e69a546844d0f23770f3dd5e690f20284a27cd01 100644 (file)
@@ -15,7 +15,6 @@
 #include <linux/seq_file.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/parser.h>
 #include <linux/statfs.h>
 
@@ -25,11 +24,6 @@ MODULE_LICENSE("GPL");
 
 spinlock_t fuse_lock;
 static kmem_cache_t *fuse_inode_cachep;
-static int mount_count;
-
-static int mount_max = 1000;
-module_param(mount_max, int, 0644);
-MODULE_PARM_DESC(mount_max, "Maximum number of FUSE mounts allowed, if -1 then unlimited (default: 1000)");
 
 #define FUSE_SUPER_MAGIC 0x65735546
 
@@ -37,6 +31,13 @@ struct fuse_mount_data {
        int fd;
        unsigned rootmode;
        unsigned user_id;
+       unsigned group_id;
+       unsigned fd_present : 1;
+       unsigned rootmode_present : 1;
+       unsigned user_id_present : 1;
+       unsigned group_id_present : 1;
+       unsigned flags;
+       unsigned max_read;
 };
 
 static struct inode *fuse_alloc_inode(struct super_block *sb)
@@ -51,12 +52,21 @@ static struct inode *fuse_alloc_inode(struct super_block *sb)
        fi = get_fuse_inode(inode);
        fi->i_time = jiffies - 1;
        fi->nodeid = 0;
+       fi->nlookup = 0;
+       fi->forget_req = fuse_request_alloc();
+       if (!fi->forget_req) {
+               kmem_cache_free(fuse_inode_cachep, inode);
+               return NULL;
+       }
 
        return inode;
 }
 
 static void fuse_destroy_inode(struct inode *inode)
 {
+       struct fuse_inode *fi = get_fuse_inode(inode);
+       if (fi->forget_req)
+               fuse_request_free(fi->forget_req);
        kmem_cache_free(fuse_inode_cachep, inode);
 }
 
@@ -65,8 +75,27 @@ static void fuse_read_inode(struct inode *inode)
        /* No op */
 }
 
+void fuse_send_forget(struct fuse_conn *fc, struct fuse_req *req,
+                     unsigned long nodeid, u64 nlookup)
+{
+       struct fuse_forget_in *inarg = &req->misc.forget_in;
+       inarg->nlookup = nlookup;
+       req->in.h.opcode = FUSE_FORGET;
+       req->in.h.nodeid = nodeid;
+       req->in.numargs = 1;
+       req->in.args[0].size = sizeof(struct fuse_forget_in);
+       req->in.args[0].value = inarg;
+       request_send_noreply(fc, req);
+}
+
 static void fuse_clear_inode(struct inode *inode)
 {
+       if (inode->i_sb->s_flags & MS_ACTIVE) {
+               struct fuse_conn *fc = get_fuse_conn(inode);
+               struct fuse_inode *fi = get_fuse_inode(inode);
+               fuse_send_forget(fc, fi->forget_req, fi->nodeid, fi->nlookup);
+               fi->forget_req = NULL;
+       }
 }
 
 void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr)
@@ -94,6 +123,24 @@ static void fuse_init_inode(struct inode *inode, struct fuse_attr *attr)
 {
        inode->i_mode = attr->mode & S_IFMT;
        i_size_write(inode, attr->size);
+       if (S_ISREG(inode->i_mode)) {
+               fuse_init_common(inode);
+               fuse_init_file_inode(inode);
+       } else if (S_ISDIR(inode->i_mode))
+               fuse_init_dir(inode);
+       else if (S_ISLNK(inode->i_mode))
+               fuse_init_symlink(inode);
+       else if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode) ||
+                S_ISFIFO(inode->i_mode) || S_ISSOCK(inode->i_mode)) {
+               fuse_init_common(inode);
+               init_special_inode(inode, inode->i_mode,
+                                  new_decode_dev(attr->rdev));
+       } else {
+               /* Don't let user create weird files */
+               inode->i_mode = S_IFREG;
+               fuse_init_common(inode);
+               fuse_init_file_inode(inode);
+       }
 }
 
 static int fuse_inode_eq(struct inode *inode, void *_nodeidp)
@@ -113,9 +160,10 @@ static int fuse_inode_set(struct inode *inode, void *_nodeidp)
 }
 
 struct inode *fuse_iget(struct super_block *sb, unsigned long nodeid,
-                       int generation, struct fuse_attr *attr, int version)
+                       int generation, struct fuse_attr *attr)
 {
        struct inode *inode;
+       struct fuse_inode *fi;
        struct fuse_conn *fc = get_fuse_conn_super(sb);
        int retried = 0;
 
@@ -125,6 +173,7 @@ struct inode *fuse_iget(struct super_block *sb, unsigned long nodeid,
                return NULL;
 
        if ((inode->i_state & I_NEW)) {
+               inode->i_flags |= S_NOATIME|S_NOCMTIME;
                inode->i_generation = generation;
                inode->i_data.backing_dev_info = &fc->bdi;
                fuse_init_inode(inode, attr);
@@ -138,8 +187,9 @@ struct inode *fuse_iget(struct super_block *sb, unsigned long nodeid,
                goto retry;
        }
 
+       fi = get_fuse_inode(inode);
+       fi->nlookup ++;
        fuse_change_attributes(inode, attr);
-       inode->i_version = version;
        return inode;
 }
 
@@ -147,25 +197,68 @@ static void fuse_put_super(struct super_block *sb)
 {
        struct fuse_conn *fc = get_fuse_conn_super(sb);
 
+       down_write(&fc->sbput_sem);
+       while (!list_empty(&fc->background))
+               fuse_release_background(list_entry(fc->background.next,
+                                                  struct fuse_req, bg_entry));
+
        spin_lock(&fuse_lock);
-       mount_count --;
-       fc->sb = NULL;
+       fc->mounted = 0;
        fc->user_id = 0;
+       fc->group_id = 0;
+       fc->flags = 0;
        /* Flush all readers on this fs */
        wake_up_all(&fc->waitq);
+       up_write(&fc->sbput_sem);
        fuse_release_conn(fc);
-       *get_fuse_conn_super_p(sb) = NULL;
        spin_unlock(&fuse_lock);
 }
 
+static void convert_fuse_statfs(struct kstatfs *stbuf, struct fuse_kstatfs *attr)
+{
+       stbuf->f_type    = FUSE_SUPER_MAGIC;
+       stbuf->f_bsize   = attr->bsize;
+       stbuf->f_blocks  = attr->blocks;
+       stbuf->f_bfree   = attr->bfree;
+       stbuf->f_bavail  = attr->bavail;
+       stbuf->f_files   = attr->files;
+       stbuf->f_ffree   = attr->ffree;
+       stbuf->f_namelen = attr->namelen;
+       /* fsid is left zero */
+}
+
+static int fuse_statfs(struct super_block *sb, struct kstatfs *buf)
+{
+       struct fuse_conn *fc = get_fuse_conn_super(sb);
+       struct fuse_req *req;
+       struct fuse_statfs_out outarg;
+       int err;
+
+        req = fuse_get_request(fc);
+       if (!req)
+               return -EINTR;
+
+       req->in.numargs = 0;
+       req->in.h.opcode = FUSE_STATFS;
+       req->out.numargs = 1;
+       req->out.args[0].size = sizeof(outarg);
+       req->out.args[0].value = &outarg;
+       request_send(fc, req);
+       err = req->out.h.error;
+       if (!err)
+               convert_fuse_statfs(buf, &outarg.st);
+       fuse_put_request(fc, req);
+       return err;
+}
+
 enum {
        OPT_FD,
        OPT_ROOTMODE,
        OPT_USER_ID,
+       OPT_GROUP_ID,
        OPT_DEFAULT_PERMISSIONS,
        OPT_ALLOW_OTHER,
-       OPT_ALLOW_ROOT,
-       OPT_KERNEL_CACHE,
+       OPT_MAX_READ,
        OPT_ERR
 };
 
@@ -173,10 +266,10 @@ static match_table_t tokens = {
        {OPT_FD,                        "fd=%u"},
        {OPT_ROOTMODE,                  "rootmode=%o"},
        {OPT_USER_ID,                   "user_id=%u"},
+       {OPT_GROUP_ID,                  "group_id=%u"},
        {OPT_DEFAULT_PERMISSIONS,       "default_permissions"},
        {OPT_ALLOW_OTHER,               "allow_other"},
-       {OPT_ALLOW_ROOT,                "allow_root"},
-       {OPT_KERNEL_CACHE,              "kernel_cache"},
+       {OPT_MAX_READ,                  "max_read=%u"},
        {OPT_ERR,                       NULL}
 };
 
@@ -184,7 +277,7 @@ static int parse_fuse_opt(char *opt, struct fuse_mount_data *d)
 {
        char *p;
        memset(d, 0, sizeof(struct fuse_mount_data));
-       d->fd = -1;
+       d->max_read = ~0;
 
        while ((p = strsep(&opt, ",")) != NULL) {
                int token;
@@ -199,25 +292,51 @@ static int parse_fuse_opt(char *opt, struct fuse_mount_data *d)
                        if (match_int(&args[0], &value))
                                return 0;
                        d->fd = value;
+                       d->fd_present = 1;
                        break;
 
                case OPT_ROOTMODE:
                        if (match_octal(&args[0], &value))
                                return 0;
                        d->rootmode = value;
+                       d->rootmode_present = 1;
                        break;
 
                case OPT_USER_ID:
                        if (match_int(&args[0], &value))
                                return 0;
                        d->user_id = value;
+                       d->user_id_present = 1;
+                       break;
+
+               case OPT_GROUP_ID:
+                       if (match_int(&args[0], &value))
+                               return 0;
+                       d->group_id = value;
+                       d->group_id_present = 1;
+                       break;
+
+               case OPT_DEFAULT_PERMISSIONS:
+                       d->flags |= FUSE_DEFAULT_PERMISSIONS;
+                       break;
+
+               case OPT_ALLOW_OTHER:
+                       d->flags |= FUSE_ALLOW_OTHER;
+                       break;
+
+               case OPT_MAX_READ:
+                       if (match_int(&args[0], &value))
+                               return 0;
+                       d->max_read = value;
                        break;
 
                default:
                        return 0;
                }
        }
-       if (d->fd == -1)
+
+       if (!d->fd_present || !d->rootmode_present ||
+           !d->user_id_present || !d->group_id_present)
                return 0;
 
        return 1;
@@ -228,6 +347,13 @@ static int fuse_show_options(struct seq_file *m, struct vfsmount *mnt)
        struct fuse_conn *fc = get_fuse_conn_super(mnt->mnt_sb);
 
        seq_printf(m, ",user_id=%u", fc->user_id);
+       seq_printf(m, ",group_id=%u", fc->group_id);
+       if (fc->flags & FUSE_DEFAULT_PERMISSIONS)
+               seq_puts(m, ",default_permissions");
+       if (fc->flags & FUSE_ALLOW_OTHER)
+               seq_puts(m, ",allow_other");
+       if (fc->max_read != ~0)
+               seq_printf(m, ",max_read=%u", fc->max_read);
        return 0;
 }
 
@@ -245,7 +371,8 @@ static void free_conn(struct fuse_conn *fc)
 /* Must be called with the fuse lock held */
 void fuse_release_conn(struct fuse_conn *fc)
 {
-       if (!fc->sb && !fc->file)
+       fc->count--;
+       if (!fc->count)
                free_conn(fc);
 }
 
@@ -257,14 +384,13 @@ static struct fuse_conn *new_conn(void)
        if (fc != NULL) {
                int i;
                memset(fc, 0, sizeof(*fc));
-               fc->sb = NULL;
-               fc->file = NULL;
-               fc->user_id = 0;
                init_waitqueue_head(&fc->waitq);
                INIT_LIST_HEAD(&fc->pending);
                INIT_LIST_HEAD(&fc->processing);
                INIT_LIST_HEAD(&fc->unused_list);
+               INIT_LIST_HEAD(&fc->background);
                sema_init(&fc->outstanding_sem, 0);
+               init_rwsem(&fc->sbput_sem);
                for (i = 0; i < FUSE_MAX_OUTSTANDING; i++) {
                        struct fuse_req *req = fuse_request_alloc();
                        if (!req) {
@@ -295,8 +421,10 @@ static struct fuse_conn *get_conn(struct file *file, struct super_block *sb)
                fc = ERR_PTR(-EINVAL);
        } else {
                file->private_data = fc;
-               fc->sb = sb;
-               fc->file = file;
+               *get_fuse_conn_super_p(sb) = fc;
+               fc->mounted = 1;
+               fc->connected = 1;
+               fc->count = 2;
        }
        spin_unlock(&fuse_lock);
        return fc;
@@ -309,7 +437,7 @@ static struct inode *get_root_inode(struct super_block *sb, unsigned mode)
 
        attr.mode = mode;
        attr.ino = FUSE_ROOT_ID;
-       return fuse_iget(sb, 1, 0, &attr, 0);
+       return fuse_iget(sb, 1, 0, &attr);
 }
 
 static struct super_operations fuse_super_operations = {
@@ -318,20 +446,10 @@ static struct super_operations fuse_super_operations = {
        .read_inode     = fuse_read_inode,
        .clear_inode    = fuse_clear_inode,
        .put_super      = fuse_put_super,
+       .statfs         = fuse_statfs,
        .show_options   = fuse_show_options,
 };
 
-static int inc_mount_count(void)
-{
-       int success = 0;
-       spin_lock(&fuse_lock);
-       mount_count ++;
-       if (mount_max == -1 || mount_count <= mount_max)
-               success = 1;
-       spin_unlock(&fuse_lock);
-       return success;
-}
-
 static int fuse_fill_super(struct super_block *sb, void *data, int silent)
 {
        struct fuse_conn *fc;
@@ -358,13 +476,13 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)
        if (IS_ERR(fc))
                return PTR_ERR(fc);
 
+       fc->flags = d.flags;
        fc->user_id = d.user_id;
-
-       *get_fuse_conn_super_p(sb) = fc;
-
-       err = -ENFILE;
-       if (!inc_mount_count() && current->uid != 0)
-               goto err;
+       fc->group_id = d.group_id;
+       fc->max_read = d.max_read;
+       if (fc->max_read / PAGE_CACHE_SIZE < fc->bdi.ra_pages)
+               fc->bdi.ra_pages = fc->max_read / PAGE_CACHE_SIZE;
+       fc->max_write = FUSE_MAX_IN / 2;
 
        err = -ENOMEM;
        root = get_root_inode(sb, d.rootmode);
@@ -381,11 +499,8 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)
 
  err:
        spin_lock(&fuse_lock);
-       mount_count --;
-       fc->sb = NULL;
        fuse_release_conn(fc);
        spin_unlock(&fuse_lock);
-       *get_fuse_conn_super_p(sb) = NULL;
        return err;
 }