diff options
| -rw-r--r-- | fs/fuse/dir.c | 29 | ||||
| -rw-r--r-- | fs/fuse/file.c | 12 | ||||
| -rw-r--r-- | fs/fuse/inode.c | 4 |
3 files changed, 32 insertions, 13 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index c72a8a97935..4782a7b103c 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -897,14 +897,29 @@ static void iattr_to_fattr(struct iattr *iattr, struct fuse_setattr_in *arg) } } +static void fuse_vmtruncate(struct inode *inode, loff_t offset) +{ + int need_trunc; + + spin_lock(&fuse_lock); + need_trunc = inode->i_size > offset; + i_size_write(inode, offset); + spin_unlock(&fuse_lock); + + if (need_trunc) { + struct address_space *mapping = inode->i_mapping; + unmap_mapping_range(mapping, offset + PAGE_SIZE - 1, 0, 1); + truncate_inode_pages(mapping, offset); + } +} + /* * Set attributes, and at the same time refresh them. * * Truncation is slightly complicated, because the 'truncate' request * may fail, in which case we don't want to touch the mapping. - * vmtruncate() doesn't allow for this case. So do the rlimit - * checking by hand and call vmtruncate() only after the file has - * actually been truncated. + * vmtruncate() doesn't allow for this case, so do the rlimit checking + * and the actual truncation by hand. */ static int fuse_setattr(struct dentry *entry, struct iattr *attr) { @@ -956,12 +971,8 @@ static int fuse_setattr(struct dentry *entry, struct iattr *attr) make_bad_inode(inode); err = -EIO; } else { - if (is_truncate) { - loff_t origsize = i_size_read(inode); - i_size_write(inode, outarg.attr.size); - if (origsize > outarg.attr.size) - vmtruncate(inode, outarg.attr.size); - } + if (is_truncate) + fuse_vmtruncate(inode, outarg.attr.size); fuse_change_attributes(inode, &outarg.attr); fi->i_time = time_to_jiffies(outarg.attr_valid, outarg.attr_valid_nsec); diff --git a/fs/fuse/file.c b/fs/fuse/file.c index ce93cf9fd0f..caebdd6d67a 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -469,8 +469,10 @@ static int fuse_commit_write(struct file *file, struct page *page, err = -EIO; if (!err) { pos += count; - if (pos > i_size_read(inode)) + spin_lock(&fuse_lock); + if (pos > inode->i_size) i_size_write(inode, pos); + spin_unlock(&fuse_lock); if (offset == 0 && to == PAGE_CACHE_SIZE) { clear_page_dirty(page); @@ -570,8 +572,12 @@ static ssize_t fuse_direct_io(struct file *file, const char __user *buf, } fuse_put_request(fc, req); if (res > 0) { - if (write && pos > i_size_read(inode)) - i_size_write(inode, pos); + if (write) { + spin_lock(&fuse_lock); + if (pos > inode->i_size) + i_size_write(inode, pos); + spin_unlock(&fuse_lock); + } *ppos = pos; } fuse_invalidate_attr(inode); diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 879e6fba948..9fe1642f51e 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -115,7 +115,9 @@ void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr) inode->i_nlink = attr->nlink; inode->i_uid = attr->uid; inode->i_gid = attr->gid; + spin_lock(&fuse_lock); i_size_write(inode, attr->size); + spin_unlock(&fuse_lock); inode->i_blksize = PAGE_CACHE_SIZE; inode->i_blocks = attr->blocks; inode->i_atime.tv_sec = attr->atime; @@ -129,7 +131,7 @@ void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr) 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); + inode->i_size = attr->size; if (S_ISREG(inode->i_mode)) { fuse_init_common(inode); fuse_init_file_inode(inode); |