diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-06 12:25:38 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-06 12:25:37 -0700 |
| commit | 46865cfa2d08f4416eb4e75fbe9c5724e429dcf9 (patch) | |
| tree | 6b8d77b480aeb1d58b618e87bcdfebc30ce66bf2 | |
| parent | c484f1d883311c1a274718e24f4957c608d13bc3 (diff) | |
| parent | 6ec3ca7f43cae1aee91e513b20efa4470356cd83 (diff) | |
Merge "fuse: Grab the fc->lock for inode updates in passthrough"
| -rw-r--r-- | fs/fuse/passthrough.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/fuse/passthrough.c b/fs/fuse/passthrough.c index e8671942c2a0..785af63acabd 100644 --- a/fs/fuse/passthrough.c +++ b/fs/fuse/passthrough.c @@ -71,10 +71,12 @@ static ssize_t fuse_passthrough_read_write_iter(struct kiocb *iocb, struct fuse_file *ff; struct file *fuse_file, *passthrough_filp; struct inode *fuse_inode, *passthrough_inode; + struct fuse_conn *fc; ff = iocb->ki_filp->private_data; fuse_file = iocb->ki_filp; passthrough_filp = ff->passthrough_filp; + fc = ff->fc; /* lock passthrough file to prevent it from being released */ 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); if (ret_val >= 0 || ret_val == -EIOCBQUEUED) { + spin_lock(&fc->lock); fsstack_copy_inode_size(fuse_inode, passthrough_inode); + spin_unlock(&fc->lock); fsstack_copy_attr_times(fuse_inode, passthrough_inode); } } else { |