Commit 2e64ff15 authored by Chad Austin's avatar Chad Austin Committed by Miklos Szeredi
Browse files

fuse: continue to send FUSE_RELEASEDIR when FUSE_OPEN returns ENOSYS

When FUSE_OPEN returns ENOSYS, the no_open bit is set on the connection.

Because the FUSE_RELEASE and FUSE_RELEASEDIR paths share code, this
incorrectly caused the FUSE_RELEASEDIR request to be dropped and never sent
to userspace.

Pass an isdir bool to distinguish between FUSE_RELEASE and FUSE_RELEASEDIR
inside of fuse_file_put.

Fixes: 7678ac50

 ("fuse: support clients that don't implement 'open'")
Cc: <stable@vger.kernel.org> # v3.14
Signed-off-by: default avatarChad Austin <chadaustin@fb.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent d72f70da
...@@ -1243,7 +1243,7 @@ static int fuse_dir_open(struct inode *inode, struct file *file) ...@@ -1243,7 +1243,7 @@ static int fuse_dir_open(struct inode *inode, struct file *file)
static int fuse_dir_release(struct inode *inode, struct file *file) static int fuse_dir_release(struct inode *inode, struct file *file)
{ {
fuse_release_common(file, FUSE_RELEASEDIR); fuse_release_common(file, true);
return 0; return 0;
} }
......
...@@ -89,12 +89,12 @@ static void fuse_release_end(struct fuse_conn *fc, struct fuse_req *req) ...@@ -89,12 +89,12 @@ static void fuse_release_end(struct fuse_conn *fc, struct fuse_req *req)
iput(req->misc.release.inode); iput(req->misc.release.inode);
} }
static void fuse_file_put(struct fuse_file *ff, bool sync) static void fuse_file_put(struct fuse_file *ff, bool sync, bool isdir)
{ {
if (refcount_dec_and_test(&ff->count)) { if (refcount_dec_and_test(&ff->count)) {
struct fuse_req *req = ff->reserved_req; struct fuse_req *req = ff->reserved_req;
if (ff->fc->no_open) { if (ff->fc->no_open && !isdir) {
/* /*
* Drop the release request when client does not * Drop the release request when client does not
* implement 'open' * implement 'open'
...@@ -247,10 +247,11 @@ static void fuse_prepare_release(struct fuse_file *ff, int flags, int opcode) ...@@ -247,10 +247,11 @@ static void fuse_prepare_release(struct fuse_file *ff, int flags, int opcode)
req->in.args[0].value = inarg; req->in.args[0].value = inarg;
} }
void fuse_release_common(struct file *file, int opcode) void fuse_release_common(struct file *file, bool isdir)
{ {
struct fuse_file *ff = file->private_data; struct fuse_file *ff = file->private_data;
struct fuse_req *req = ff->reserved_req; struct fuse_req *req = ff->reserved_req;
int opcode = isdir ? FUSE_RELEASEDIR : FUSE_RELEASE;
fuse_prepare_release(ff, file->f_flags, opcode); fuse_prepare_release(ff, file->f_flags, opcode);
...@@ -272,7 +273,7 @@ void fuse_release_common(struct file *file, int opcode) ...@@ -272,7 +273,7 @@ void fuse_release_common(struct file *file, int opcode)
* synchronous RELEASE is allowed (and desirable) in this case * synchronous RELEASE is allowed (and desirable) in this case
* because the server can be trusted not to screw up. * because the server can be trusted not to screw up.
*/ */
fuse_file_put(ff, ff->fc->destroy_req != NULL); fuse_file_put(ff, ff->fc->destroy_req != NULL, isdir);
} }
static int fuse_open(struct inode *inode, struct file *file) static int fuse_open(struct inode *inode, struct file *file)
...@@ -288,7 +289,7 @@ static int fuse_release(struct inode *inode, struct file *file) ...@@ -288,7 +289,7 @@ static int fuse_release(struct inode *inode, struct file *file)
if (fc->writeback_cache) if (fc->writeback_cache)
write_inode_now(inode, 1); write_inode_now(inode, 1);
fuse_release_common(file, FUSE_RELEASE); fuse_release_common(file, false);
/* return value is ignored by VFS */ /* return value is ignored by VFS */
return 0; return 0;
...@@ -302,7 +303,7 @@ void fuse_sync_release(struct fuse_file *ff, int flags) ...@@ -302,7 +303,7 @@ void fuse_sync_release(struct fuse_file *ff, int flags)
* iput(NULL) is a no-op and since the refcount is 1 and everything's * iput(NULL) is a no-op and since the refcount is 1 and everything's
* synchronous, we are fine with not doing igrab() here" * synchronous, we are fine with not doing igrab() here"
*/ */
fuse_file_put(ff, true); fuse_file_put(ff, true, false);
} }
EXPORT_SYMBOL_GPL(fuse_sync_release); EXPORT_SYMBOL_GPL(fuse_sync_release);
...@@ -808,7 +809,7 @@ static void fuse_readpages_end(struct fuse_conn *fc, struct fuse_req *req) ...@@ -808,7 +809,7 @@ static void fuse_readpages_end(struct fuse_conn *fc, struct fuse_req *req)
put_page(page); put_page(page);
} }
if (req->ff) if (req->ff)
fuse_file_put(req->ff, false); fuse_file_put(req->ff, false, false);
} }
static void fuse_send_readpages(struct fuse_req *req, struct file *file) static void fuse_send_readpages(struct fuse_req *req, struct file *file)
...@@ -1461,7 +1462,7 @@ static void fuse_writepage_free(struct fuse_conn *fc, struct fuse_req *req) ...@@ -1461,7 +1462,7 @@ static void fuse_writepage_free(struct fuse_conn *fc, struct fuse_req *req)
__free_page(req->pages[i]); __free_page(req->pages[i]);
if (req->ff) if (req->ff)
fuse_file_put(req->ff, false); fuse_file_put(req->ff, false, false);
} }
static void fuse_writepage_finish(struct fuse_conn *fc, struct fuse_req *req) static void fuse_writepage_finish(struct fuse_conn *fc, struct fuse_req *req)
...@@ -1620,7 +1621,7 @@ int fuse_write_inode(struct inode *inode, struct writeback_control *wbc) ...@@ -1620,7 +1621,7 @@ int fuse_write_inode(struct inode *inode, struct writeback_control *wbc)
ff = __fuse_write_file_get(fc, fi); ff = __fuse_write_file_get(fc, fi);
err = fuse_flush_times(inode, ff); err = fuse_flush_times(inode, ff);
if (ff) if (ff)
fuse_file_put(ff, 0); fuse_file_put(ff, false, false);
return err; return err;
} }
...@@ -1941,7 +1942,7 @@ static int fuse_writepages(struct address_space *mapping, ...@@ -1941,7 +1942,7 @@ static int fuse_writepages(struct address_space *mapping,
err = 0; err = 0;
} }
if (data.ff) if (data.ff)
fuse_file_put(data.ff, false); fuse_file_put(data.ff, false, false);
kfree(data.orig_pages); kfree(data.orig_pages);
out: out:
......
...@@ -822,7 +822,7 @@ void fuse_sync_release(struct fuse_file *ff, int flags); ...@@ -822,7 +822,7 @@ void fuse_sync_release(struct fuse_file *ff, int flags);
/** /**
* Send RELEASE or RELEASEDIR request * Send RELEASE or RELEASEDIR request
*/ */
void fuse_release_common(struct file *file, int opcode); void fuse_release_common(struct file *file, bool isdir);
/** /**
* Send FSYNC or FSYNCDIR request * Send FSYNC or FSYNCDIR request
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment