A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-05 19:31:57 -04:00
Code Issues Projects Releases Packages Wiki Activity

UPSTREAM: fuse: store fuse_conn in fuse_req

Browse source 
Every fuse_req belongs to a fuse_conn.  Right now, we always know which
fuse_conn that is based on the respective device, but we want to allow
multiple (sub)mounts per single connection, and then the corresponding
filesystem is not going to be so trivial to obtain.

Storing a pointer to the associated fuse_conn in every fuse_req will
allow us to trivially find any request's superblock (and thus
filesystem) even then.

Change-Id: I60a5e891535ab5c172d3658c3b6f42f4804e2a21
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
Max Reitz 2020-04-20 17:54:38 +02:00 • committed by Alexander Martinz
commit 9784782e98
No known key found for this signature in database
GPG key ID: CF15BDD9A321A9B2
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
fs/fuse/dev.c
View file

@ -42,20 +42,21 @@ static struct fuse_dev *fuse_get_dev(struct file *file)
return READ_ONCE(file->private_data);
}
static void fuse_request_init(struct fuse_req *req)
static void fuse_request_init(struct fuse_conn *fc, struct fuse_req *req)
{
INIT_LIST_HEAD(&req->list);
INIT_LIST_HEAD(&req->intr_entry);
init_waitqueue_head(&req->waitq);
refcount_set(&req->count, 1);
__set_bit(FR_PENDING, &req->flags);
req->fc = fc;
}
static struct fuse_req *fuse_request_alloc(gfp_t flags)
static struct fuse_req *fuse_request_alloc(struct fuse_conn *fc, gfp_t flags)
{
struct fuse_req *req = kmem_cache_zalloc(fuse_req_cachep, flags);
if (req)
fuse_request_init(req);
fuse_request_init(fc, req);
return req;
}
@ -127,7 +128,7 @@ static struct fuse_req *fuse_get_req(struct fuse_conn *fc, bool for_background)
if (fc->conn_error)
goto out;
req = fuse_request_alloc(GFP_KERNEL);
req = fuse_request_alloc(fc, GFP_KERNEL);
err = -ENOMEM;
if (!req) {
if (for_background)
@ -487,7 +488,7 @@ ssize_t fuse_simple_request(struct fuse_conn *fc, struct fuse_args *args)
if (args->force) {
atomic_inc(&fc->num_waiting);
req = fuse_request_alloc(GFP_KERNEL | __GFP_NOFAIL);
req = fuse_request_alloc(fc, GFP_KERNEL | __GFP_NOFAIL);
if (!args->nocreds)
fuse_force_creds(fc, req);
@ -554,7 +555,7 @@ int fuse_simple_background(struct fuse_conn *fc, struct fuse_args *args,
if (args->force) {
WARN_ON(!args->nocreds);
req = fuse_request_alloc(gfp_flags);
req = fuse_request_alloc(fc, gfp_flags);
if (!req)
return -ENOMEM;
__set_bit(FR_BACKGROUND, &req->flags);

3
fs/fuse/fuse_i.h
View file

@ -394,6 +394,9 @@ struct fuse_req {
/** virtio-fs's physically contiguous buffer for in and out args */
void *argbuf;
#endif
/** fuse_conn this request belongs to */
struct fuse_conn *fc;
};
struct fuse_iqueue;