evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fuse: Grab the fc->lock for inode updates in passthrough"

Browse source
This commit is contained in:
Linux Build Service Account 2016-10-06 12:25:38 -07:00 • committed by Gerrit - the friendly Code Review server
commit 46865cfa2d
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/fuse/passthrough.c
View file

@ -71,10 +71,12 @@ static ssize_t fuse_passthrough_read_write_iter(struct kiocb *iocb,
struct fuse_file *ff; struct fuse_file *ff;
struct file *fuse_file, *passthrough_filp; struct file *fuse_file, *passthrough_filp;
struct inode *fuse_inode, *passthrough_inode; struct inode *fuse_inode, *passthrough_inode;
struct fuse_conn *fc;
ff = iocb->ki_filp->private_data; ff = iocb->ki_filp->private_data;
fuse_file = iocb->ki_filp; fuse_file = iocb->ki_filp;
passthrough_filp = ff->passthrough_filp; passthrough_filp = ff->passthrough_filp;
fc = ff->fc;
/* lock passthrough file to prevent it from being released */ /* lock passthrough file to prevent it from being released */
get_file(passthrough_filp); get_file(passthrough_filp);
@ -88,7 +90,9 @@ static ssize_t fuse_passthrough_read_write_iter(struct kiocb *iocb,
ret_val = passthrough_filp->f_op->write_iter(iocb, iter); ret_val = passthrough_filp->f_op->write_iter(iocb, iter);
if (ret_val >= 0 || ret_val == -EIOCBQUEUED) { if (ret_val >= 0 || ret_val == -EIOCBQUEUED) {
spin_lock(&fc->lock);
fsstack_copy_inode_size(fuse_inode, passthrough_inode); fsstack_copy_inode_size(fuse_inode, passthrough_inode);
spin_unlock(&fc->lock);
fsstack_copy_attr_times(fuse_inode, passthrough_inode); fsstack_copy_attr_times(fuse_inode, passthrough_inode);
} }
} else { } else {