Skip to content

Commit c1531c7

Browse files
amir73ilbsbernd
authored andcommitted
fuse: prepare for failing open response
In preparation for inode io modes, a server open response could fail due to conflicting inode io modes. Allow returning an error from fuse_finish_open() and handle the error in the callers. fuse_finish_open() is used as the callback of finish_open(), so that FMODE_OPENED will not be set if fuse_finish_open() fails. Signed-off-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com> (cherry picked from commit d2c487f)
1 parent 8dcafbe commit c1531c7

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

fs/fuse/dir.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -699,13 +699,15 @@ static int fuse_create_open(struct inode *dir, struct dentry *entry,
699699
d_instantiate(entry, inode);
700700
fuse_change_entry_timeout(entry, &outentry);
701701
fuse_dir_changed(dir);
702-
err = finish_open(file, entry, generic_file_open);
702+
err = generic_file_open(inode, file);
703+
if (!err) {
704+
file->private_data = ff;
705+
err = finish_open(file, entry, fuse_finish_open);
706+
}
703707
if (err) {
704708
fi = get_fuse_inode(inode);
705709
fuse_sync_release(fi, ff, flags);
706710
} else {
707-
file->private_data = ff;
708-
fuse_finish_open(inode, file);
709711
if (fm->fc->atomic_o_trunc && trunc)
710712
truncate_pagecache(inode, 0);
711713
else if (!(ff->open_flags & FOPEN_KEEP_CACHE))

fs/fuse/file.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ static void fuse_link_write_file(struct file *file)
200200
spin_unlock(&fi->lock);
201201
}
202202

203-
void fuse_finish_open(struct inode *inode, struct file *file)
203+
int fuse_finish_open(struct inode *inode, struct file *file)
204204
{
205205
struct fuse_file *ff = file->private_data;
206206
struct fuse_conn *fc = get_fuse_conn(inode);
@@ -212,6 +212,8 @@ void fuse_finish_open(struct inode *inode, struct file *file)
212212

213213
if ((file->f_mode & FMODE_WRITE) && fc->writeback_cache)
214214
fuse_link_write_file(file);
215+
216+
return 0;
215217
}
216218

217219
static void fuse_truncate_update_attr(struct inode *inode, struct file *file)
@@ -230,7 +232,9 @@ static void fuse_truncate_update_attr(struct inode *inode, struct file *file)
230232
static int fuse_open(struct inode *inode, struct file *file)
231233
{
232234
struct fuse_mount *fm = get_fuse_mount(inode);
235+
struct fuse_inode *fi = get_fuse_inode(inode);
233236
struct fuse_conn *fc = fm->fc;
237+
struct fuse_file *ff;
234238
int err;
235239
bool is_truncate = (file->f_flags & O_TRUNC) && fc->atomic_o_trunc;
236240
bool is_wb_truncate = is_truncate && fc->writeback_cache;
@@ -258,16 +262,17 @@ static int fuse_open(struct inode *inode, struct file *file)
258262

259263
err = fuse_do_open(fm, get_node_id(inode), file, false);
260264
if (!err) {
261-
fuse_finish_open(inode, file);
262-
if (is_truncate)
265+
ff = file->private_data;
266+
err = fuse_finish_open(inode, file);
267+
if (err)
268+
fuse_sync_release(fi, ff, file->f_flags);
269+
else if (is_truncate)
263270
fuse_truncate_update_attr(inode, file);
264271
}
265272

266273
if (is_wb_truncate || dax_truncate)
267274
fuse_release_nowrite(inode);
268275
if (!err) {
269-
struct fuse_file *ff = file->private_data;
270-
271276
if (is_truncate)
272277
truncate_pagecache(inode, 0);
273278
else if (!(ff->open_flags & FOPEN_KEEP_CACHE))

fs/fuse/fuse_i.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1083,7 +1083,7 @@ void fuse_read_args_fill(struct fuse_io_args *ia, struct file *file, loff_t pos,
10831083

10841084
struct fuse_file *fuse_file_alloc(struct fuse_mount *fm, bool release);
10851085
void fuse_file_free(struct fuse_file *ff);
1086-
void fuse_finish_open(struct inode *inode, struct file *file);
1086+
int fuse_finish_open(struct inode *inode, struct file *file);
10871087

10881088
void fuse_sync_release(struct fuse_inode *fi, struct fuse_file *ff,
10891089
unsigned int flags);

0 commit comments

Comments
 (0)