diff options
| author |   Kirill Tkhai <ktkhai@virtuozzo.com> | 2018-11-09 13:33:11 +0300 |
|---|---|---|
| committer |   Miklos Szeredi <mszeredi@redhat.com> | 2019-02-13 13:15:13 +0100 |
| commit | ebf84d0c7220c7c9b904c405e61175d2a50cfb39 (patch) | |
| tree | c25274f3cdca08b202bfecf4ff3edb2fe7baa273 /fs/fuse/dir.c | |
| parent | fuse: Verify userspace asks to requeue interrupt that we really sent (diff) | |
| download | linux-dev-ebf84d0c7220c7c9b904c405e61175d2a50cfb39.tar.xz linux-dev-ebf84d0c7220c7c9b904c405e61175d2a50cfb39.zip | |
fuse: Add fuse_inode argument to fuse_prepare_release()
Here is preparation for next patches, which introduce new fi->lock for
protection of ff->write_entry linked into fi->write_files.
This patch just passes new argument to the function.
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/fuse/dir.c')
| -rw-r--r-- | fs/fuse/dir.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index e909678afa2d..46c7430b94fc 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -400,6 +400,7 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, struct fuse_create_in inarg; struct fuse_open_out outopen; struct fuse_entry_out outentry; + struct fuse_inode *fi; struct fuse_file *ff; /* Userspace expects S_IFREG in create mode */ @@ -451,7 +452,7 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, &outentry.attr, entry_attr_timeout(&outentry), 0); if (!inode) { flags &= ~(O_CREAT | O_EXCL | O_TRUNC); - fuse_sync_release(ff, flags); + fuse_sync_release(NULL, ff, flags); fuse_queue_forget(fc, forget, outentry.nodeid, 1); err = -ENOMEM; goto out_err; @@ -462,7 +463,8 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry, fuse_dir_changed(dir); err = finish_open(file, entry, generic_file_open); if (err) { - fuse_sync_release(ff, flags); + fi = get_fuse_inode(inode); + fuse_sync_release(fi, ff, flags); } else { file->private_data = ff; fuse_finish_open(inode, file); |