1 files changed, 44 insertions, 8 deletions

diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 5448f625ab56..fd0735715c14 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -109,20 +109,25 @@ static int fuse_remount_fs(struct super_block *sb, int *flags, char *data)
         return 0;
 }
 
+static void fuse_truncate(struct address_space *mapping, loff_t offset)
+{
+        /* See vmtruncate() */
+        unmap_mapping_range(mapping, offset + PAGE_SIZE - 1, 0, 1);
+        truncate_inode_pages(mapping, offset);
+        unmap_mapping_range(mapping, offset + PAGE_SIZE - 1, 0, 1);
+}
+
 void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr)
 {
         struct fuse_conn *fc = get_fuse_conn(inode);
-        if (S_ISREG(inode->i_mode) && i_size_read(inode) != attr->size)
-                invalidate_mapping_pages(inode->i_mapping, 0, -1);
+        struct fuse_inode *fi = get_fuse_inode(inode);
+        loff_t oldsize;
 
         inode->i_ino     = attr->ino;
-        inode->i_mode    = (inode->i_mode & S_IFMT) + (attr->mode & 07777);
+        inode->i_mode    = (inode->i_mode & S_IFMT) | (attr->mode & 07777);
         inode->i_nlink   = attr->nlink;
         inode->i_uid     = attr->uid;
         inode->i_gid     = attr->gid;
-        spin_lock(&fc->lock);
-        i_size_write(inode, attr->size);
-        spin_unlock(&fc->lock);
         inode->i_blocks  = attr->blocks;
         inode->i_atime.tv_sec   = attr->atime;
         inode->i_atime.tv_nsec  = attr->atimensec;
@@ -130,6 +135,26 @@ void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr)
         inode->i_mtime.tv_nsec  = attr->mtimensec;
         inode->i_ctime.tv_sec   = attr->ctime;
         inode->i_ctime.tv_nsec  = attr->ctimensec;
+
+        /*
+         * Don't set the sticky bit in i_mode, unless we want the VFS
+         * to check permissions.  This prevents failures due to the
+         * check in may_delete().
+         */
+        fi->orig_i_mode = inode->i_mode;
+        if (!(fc->flags & FUSE_DEFAULT_PERMISSIONS))
+                inode->i_mode &= ~S_ISVTX;
+
+        spin_lock(&fc->lock);
+        oldsize = inode->i_size;
+        i_size_write(inode, attr->size);
+        spin_unlock(&fc->lock);
+
+        if (S_ISREG(inode->i_mode) && oldsize != attr->size) {
+                if (attr->size < oldsize)
+                        fuse_truncate(inode->i_mapping, attr->size);
+                invalidate_inode_pages2(inode->i_mapping);
+        }
 }
 
 static void fuse_init_inode(struct inode *inode, struct fuse_attr *attr)
@@ -232,6 +257,7 @@ static void fuse_put_super(struct super_block *sb)
         kill_fasync(&fc->fasync, SIGIO, POLL_IN);
         wake_up_all(&fc->waitq);
         wake_up_all(&fc->blocked_waitq);
+        wake_up_all(&fc->reserved_req_waitq);
         mutex_lock(&fuse_mutex);
         list_del(&fc->entry);
         fuse_ctl_remove_conn(fc);
@@ -401,6 +427,7 @@ static int fuse_show_options(struct seq_file *m, struct vfsmount *mnt)
 static struct fuse_conn *new_conn(void)
 {
         struct fuse_conn *fc;
+        int err;
 
         fc = kzalloc(sizeof(*fc), GFP_KERNEL);
         if (fc) {
@@ -409,6 +436,7 @@ static struct fuse_conn *new_conn(void)
                 atomic_set(&fc->count, 1);
                 init_waitqueue_head(&fc->waitq);
                 init_waitqueue_head(&fc->blocked_waitq);
+                init_waitqueue_head(&fc->reserved_req_waitq);
                 INIT_LIST_HEAD(&fc->pending);
                 INIT_LIST_HEAD(&fc->processing);
                 INIT_LIST_HEAD(&fc->io);
@@ -416,10 +444,17 @@ static struct fuse_conn *new_conn(void)
                 atomic_set(&fc->num_waiting, 0);
                 fc->bdi.ra_pages = (VM_MAX_READAHEAD * 1024) / PAGE_CACHE_SIZE;
                 fc->bdi.unplug_io_fn = default_unplug_io_fn;
+                err = bdi_init(&fc->bdi);
+                if (err) {
+                        kfree(fc);
+                        fc = NULL;
+                        goto out;
+                }
                 fc->reqctr = 0;
                 fc->blocked = 1;
                 get_random_bytes(&fc->scramble_key, sizeof(fc->scramble_key));
         }
+out:
         return fc;
 }
 
@@ -429,6 +464,7 @@ void fuse_conn_put(struct fuse_conn *fc)
                 if (fc->destroy_req)
                         fuse_request_free(fc->destroy_req);
                 mutex_destroy(&fc->inst_mutex);
+                bdi_destroy(&fc->bdi);
                 kfree(fc);
         }
 }
@@ -446,6 +482,7 @@ static struct inode *get_root_inode(struct super_block *sb, unsigned mode)
 
         attr.mode = mode;
         attr.ino = FUSE_ROOT_ID;
+        attr.nlink = 1;
         return fuse_iget(sb, 1, 0, &attr);
 }
 
@@ -683,8 +720,7 @@ static inline void unregister_fuseblk(void)
 static decl_subsys(fuse, NULL, NULL);
 static decl_subsys(connections, NULL, NULL);
 
-static void fuse_inode_init_once(void *foo, struct kmem_cache *cachep,
-                                 unsigned long flags)
+static void fuse_inode_init_once(struct kmem_cache *cachep, void *foo)
 {
         struct inode * inode = foo;