Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: make fuse_dentry_revalidate() RCU aware fuse: make fuse_permission() RCU aware fuse: wakeup pollers on connection release/abort fuse: reduce size of struct fuse_request
This commit is contained in:
commit
f741a79e98
|
@ -305,7 +305,7 @@ static void cuse_gendev_release(struct device *dev)
|
|||
static void cuse_process_init_reply(struct fuse_conn *fc, struct fuse_req *req)
|
||||
{
|
||||
struct cuse_conn *cc = fc_to_cc(fc);
|
||||
struct cuse_init_out *arg = &req->misc.cuse_init_out;
|
||||
struct cuse_init_out *arg = req->out.args[0].value;
|
||||
struct page *page = req->pages[0];
|
||||
struct cuse_devinfo devinfo = { };
|
||||
struct device *dev;
|
||||
|
@ -384,6 +384,7 @@ static void cuse_process_init_reply(struct fuse_conn *fc, struct fuse_req *req)
|
|||
dev_set_uevent_suppress(dev, 0);
|
||||
kobject_uevent(&dev->kobj, KOBJ_ADD);
|
||||
out:
|
||||
kfree(arg);
|
||||
__free_page(page);
|
||||
return;
|
||||
|
||||
|
@ -405,6 +406,7 @@ static int cuse_send_init(struct cuse_conn *cc)
|
|||
struct page *page;
|
||||
struct fuse_conn *fc = &cc->fc;
|
||||
struct cuse_init_in *arg;
|
||||
void *outarg;
|
||||
|
||||
BUILD_BUG_ON(CUSE_INIT_INFO_MAX > PAGE_SIZE);
|
||||
|
||||
|
@ -419,6 +421,10 @@ static int cuse_send_init(struct cuse_conn *cc)
|
|||
if (!page)
|
||||
goto err_put_req;
|
||||
|
||||
outarg = kzalloc(sizeof(struct cuse_init_out), GFP_KERNEL);
|
||||
if (!outarg)
|
||||
goto err_free_page;
|
||||
|
||||
arg = &req->misc.cuse_init_in;
|
||||
arg->major = FUSE_KERNEL_VERSION;
|
||||
arg->minor = FUSE_KERNEL_MINOR_VERSION;
|
||||
|
@ -429,7 +435,7 @@ static int cuse_send_init(struct cuse_conn *cc)
|
|||
req->in.args[0].value = arg;
|
||||
req->out.numargs = 2;
|
||||
req->out.args[0].size = sizeof(struct cuse_init_out);
|
||||
req->out.args[0].value = &req->misc.cuse_init_out;
|
||||
req->out.args[0].value = outarg;
|
||||
req->out.args[1].size = CUSE_INIT_INFO_MAX;
|
||||
req->out.argvar = 1;
|
||||
req->out.argpages = 1;
|
||||
|
@ -440,6 +446,8 @@ static int cuse_send_init(struct cuse_conn *cc)
|
|||
|
||||
return 0;
|
||||
|
||||
err_free_page:
|
||||
__free_page(page);
|
||||
err_put_req:
|
||||
fuse_put_request(fc, req);
|
||||
err:
|
||||
|
|
|
@ -1910,6 +1910,21 @@ __acquires(fc->lock)
|
|||
kfree(dequeue_forget(fc, 1, NULL));
|
||||
}
|
||||
|
||||
static void end_polls(struct fuse_conn *fc)
|
||||
{
|
||||
struct rb_node *p;
|
||||
|
||||
p = rb_first(&fc->polled_files);
|
||||
|
||||
while (p) {
|
||||
struct fuse_file *ff;
|
||||
ff = rb_entry(p, struct fuse_file, polled_node);
|
||||
wake_up_interruptible_all(&ff->poll_wait);
|
||||
|
||||
p = rb_next(p);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Abort all requests.
|
||||
*
|
||||
|
@ -1937,6 +1952,7 @@ void fuse_abort_conn(struct fuse_conn *fc)
|
|||
fc->blocked = 0;
|
||||
end_io_requests(fc);
|
||||
end_queued_requests(fc);
|
||||
end_polls(fc);
|
||||
wake_up_all(&fc->waitq);
|
||||
wake_up_all(&fc->blocked_waitq);
|
||||
kill_fasync(&fc->fasync, SIGIO, POLL_IN);
|
||||
|
@ -1953,6 +1969,7 @@ int fuse_dev_release(struct inode *inode, struct file *file)
|
|||
fc->connected = 0;
|
||||
fc->blocked = 0;
|
||||
end_queued_requests(fc);
|
||||
end_polls(fc);
|
||||
wake_up_all(&fc->blocked_waitq);
|
||||
spin_unlock(&fc->lock);
|
||||
fuse_conn_put(fc);
|
||||
|
|
|
@ -158,10 +158,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, struct nameidata *nd)
|
|||
{
|
||||
struct inode *inode;
|
||||
|
||||
if (nd && nd->flags & LOOKUP_RCU)
|
||||
return -ECHILD;
|
||||
|
||||
inode = entry->d_inode;
|
||||
inode = ACCESS_ONCE(entry->d_inode);
|
||||
if (inode && is_bad_inode(inode))
|
||||
return 0;
|
||||
else if (fuse_dentry_time(entry) < get_jiffies_64()) {
|
||||
|
@ -177,6 +174,9 @@ static int fuse_dentry_revalidate(struct dentry *entry, struct nameidata *nd)
|
|||
if (!inode)
|
||||
return 0;
|
||||
|
||||
if (nd->flags & LOOKUP_RCU)
|
||||
return -ECHILD;
|
||||
|
||||
fc = get_fuse_conn(inode);
|
||||
req = fuse_get_req(fc);
|
||||
if (IS_ERR(req))
|
||||
|
@ -970,6 +970,14 @@ static int fuse_access(struct inode *inode, int mask)
|
|||
return err;
|
||||
}
|
||||
|
||||
static int fuse_perm_getattr(struct inode *inode, int flags)
|
||||
{
|
||||
if (flags & IPERM_FLAG_RCU)
|
||||
return -ECHILD;
|
||||
|
||||
return fuse_do_getattr(inode, NULL, NULL);
|
||||
}
|
||||
|
||||
/*
|
||||
* Check permission. The two basic access models of FUSE are:
|
||||
*
|
||||
|
@ -989,9 +997,6 @@ static int fuse_permission(struct inode *inode, int mask, unsigned int flags)
|
|||
bool refreshed = false;
|
||||
int err = 0;
|
||||
|
||||
if (flags & IPERM_FLAG_RCU)
|
||||
return -ECHILD;
|
||||
|
||||
if (!fuse_allow_task(fc, current))
|
||||
return -EACCES;
|
||||
|
||||
|
@ -1000,9 +1005,15 @@ static int fuse_permission(struct inode *inode, int mask, unsigned int flags)
|
|||
*/
|
||||
if ((fc->flags & FUSE_DEFAULT_PERMISSIONS) ||
|
||||
((mask & MAY_EXEC) && S_ISREG(inode->i_mode))) {
|
||||
err = fuse_update_attributes(inode, NULL, NULL, &refreshed);
|
||||
if (err)
|
||||
return err;
|
||||
struct fuse_inode *fi = get_fuse_inode(inode);
|
||||
|
||||
if (fi->i_time < get_jiffies_64()) {
|
||||
refreshed = true;
|
||||
|
||||
err = fuse_perm_getattr(inode, flags);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
}
|
||||
|
||||
if (fc->flags & FUSE_DEFAULT_PERMISSIONS) {
|
||||
|
@ -1012,7 +1023,7 @@ static int fuse_permission(struct inode *inode, int mask, unsigned int flags)
|
|||
attributes. This is also needed, because the root
|
||||
node will at first have no permissions */
|
||||
if (err == -EACCES && !refreshed) {
|
||||
err = fuse_do_getattr(inode, NULL, NULL);
|
||||
err = fuse_perm_getattr(inode, flags);
|
||||
if (!err)
|
||||
err = generic_permission(inode, mask,
|
||||
flags, NULL);
|
||||
|
@ -1023,13 +1034,16 @@ static int fuse_permission(struct inode *inode, int mask, unsigned int flags)
|
|||
noticed immediately, only after the attribute
|
||||
timeout has expired */
|
||||
} else if (mask & (MAY_ACCESS | MAY_CHDIR)) {
|
||||
if (flags & IPERM_FLAG_RCU)
|
||||
return -ECHILD;
|
||||
|
||||
err = fuse_access(inode, mask);
|
||||
} else if ((mask & MAY_EXEC) && S_ISREG(inode->i_mode)) {
|
||||
if (!(inode->i_mode & S_IXUGO)) {
|
||||
if (refreshed)
|
||||
return -EACCES;
|
||||
|
||||
err = fuse_do_getattr(inode, NULL, NULL);
|
||||
err = fuse_perm_getattr(inode, flags);
|
||||
if (!err && !(inode->i_mode & S_IXUGO))
|
||||
return -EACCES;
|
||||
}
|
||||
|
|
|
@ -222,7 +222,7 @@ static void fuse_prepare_release(struct fuse_file *ff, int flags, int opcode)
|
|||
rb_erase(&ff->polled_node, &fc->polled_files);
|
||||
spin_unlock(&fc->lock);
|
||||
|
||||
wake_up_interruptible_sync(&ff->poll_wait);
|
||||
wake_up_interruptible_all(&ff->poll_wait);
|
||||
|
||||
inarg->fh = ff->fh;
|
||||
inarg->flags = flags;
|
||||
|
|
|
@ -272,7 +272,6 @@ struct fuse_req {
|
|||
struct fuse_init_in init_in;
|
||||
struct fuse_init_out init_out;
|
||||
struct cuse_init_in cuse_init_in;
|
||||
struct cuse_init_out cuse_init_out;
|
||||
struct {
|
||||
struct fuse_read_in in;
|
||||
u64 attr_ver;
|
||||
|
|
Loading…
Reference in a new issue