+++ /dev/null
-From 58e9060ef80221da9887c99a190f06486930f7ae Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 20 Apr 2020 17:59:34 +0200
-Subject: fuse: drop fuse_conn parameter where possible
-
-From: Max Reitz <mreitz@redhat.com>
-
-[ Upstream commit 8f622e9497bbbd5df4675edf782500cd9fe961ba ]
-
-With the last commit, all functions that handle some existing fuse_req
-no longer need to be given the associated fuse_conn, because they can
-get it from the fuse_req object.
-
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
-Stable-dep-of: b1fe686a765e ("fuse: don't unhash root")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/fuse/dev.c | 70 +++++++++++++++++++++++++--------------------
- fs/fuse/fuse_i.h | 2 +-
- fs/fuse/virtio_fs.c | 8 ++----
- 3 files changed, 43 insertions(+), 37 deletions(-)
-
-diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
-index 185cae8a7ce11..96fcb004190e2 100644
---- a/fs/fuse/dev.c
-+++ b/fs/fuse/dev.c
-@@ -101,7 +101,7 @@ static void fuse_drop_waiting(struct fuse_conn *fc)
- }
- }
-
--static void fuse_put_request(struct fuse_conn *fc, struct fuse_req *req);
-+static void fuse_put_request(struct fuse_req *req);
-
- static struct fuse_req *fuse_get_req(struct fuse_conn *fc, bool for_background)
- {
-@@ -144,7 +144,7 @@ static struct fuse_req *fuse_get_req(struct fuse_conn *fc, bool for_background)
-
- if (unlikely(req->in.h.uid == ((uid_t)-1) ||
- req->in.h.gid == ((gid_t)-1))) {
-- fuse_put_request(fc, req);
-+ fuse_put_request(req);
- return ERR_PTR(-EOVERFLOW);
- }
- return req;
-@@ -154,8 +154,10 @@ static struct fuse_req *fuse_get_req(struct fuse_conn *fc, bool for_background)
- return ERR_PTR(err);
- }
-
--static void fuse_put_request(struct fuse_conn *fc, struct fuse_req *req)
-+static void fuse_put_request(struct fuse_req *req)
- {
-+ struct fuse_conn *fc = req->fc;
-+
- if (refcount_dec_and_test(&req->count)) {
- if (test_bit(FR_BACKGROUND, &req->flags)) {
- /*
-@@ -274,8 +276,9 @@ static void flush_bg_queue(struct fuse_conn *fc)
- * the 'end' callback is called if given, else the reference to the
- * request is released
- */
--void fuse_request_end(struct fuse_conn *fc, struct fuse_req *req)
-+void fuse_request_end(struct fuse_req *req)
- {
-+ struct fuse_conn *fc = req->fc;
- struct fuse_iqueue *fiq = &fc->iq;
-
- if (test_and_set_bit(FR_FINISHED, &req->flags))
-@@ -326,12 +329,14 @@ void fuse_request_end(struct fuse_conn *fc, struct fuse_req *req)
- if (test_bit(FR_ASYNC, &req->flags))
- req->args->end(fc, req->args, req->out.h.error);
- put_request:
-- fuse_put_request(fc, req);
-+ fuse_put_request(req);
- }
- EXPORT_SYMBOL_GPL(fuse_request_end);
-
--static int queue_interrupt(struct fuse_iqueue *fiq, struct fuse_req *req)
-+static int queue_interrupt(struct fuse_req *req)
- {
-+ struct fuse_iqueue *fiq = &req->fc->iq;
-+
- spin_lock(&fiq->lock);
- /* Check for we've sent request to interrupt this req */
- if (unlikely(!test_bit(FR_INTERRUPTED, &req->flags))) {
-@@ -358,8 +363,9 @@ static int queue_interrupt(struct fuse_iqueue *fiq, struct fuse_req *req)
- return 0;
- }
-
--static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req)
-+static void request_wait_answer(struct fuse_req *req)
- {
-+ struct fuse_conn *fc = req->fc;
- struct fuse_iqueue *fiq = &fc->iq;
- int err;
-
-@@ -374,7 +380,7 @@ static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req)
- /* matches barrier in fuse_dev_do_read() */
- smp_mb__after_atomic();
- if (test_bit(FR_SENT, &req->flags))
-- queue_interrupt(fiq, req);
-+ queue_interrupt(req);
- }
-
- if (!test_bit(FR_FORCE, &req->flags)) {
-@@ -403,9 +409,9 @@ static void request_wait_answer(struct fuse_conn *fc, struct fuse_req *req)
- wait_event(req->waitq, test_bit(FR_FINISHED, &req->flags));
- }
-
--static void __fuse_request_send(struct fuse_conn *fc, struct fuse_req *req)
-+static void __fuse_request_send(struct fuse_req *req)
- {
-- struct fuse_iqueue *fiq = &fc->iq;
-+ struct fuse_iqueue *fiq = &req->fc->iq;
-
- BUG_ON(test_bit(FR_BACKGROUND, &req->flags));
- spin_lock(&fiq->lock);
-@@ -419,7 +425,7 @@ static void __fuse_request_send(struct fuse_conn *fc, struct fuse_req *req)
- __fuse_get_request(req);
- queue_request_and_unlock(fiq, req);
-
-- request_wait_answer(fc, req);
-+ request_wait_answer(req);
- /* Pairs with smp_wmb() in fuse_request_end() */
- smp_rmb();
- }
-@@ -458,8 +464,10 @@ static void fuse_adjust_compat(struct fuse_conn *fc, struct fuse_args *args)
- }
- }
-
--static void fuse_force_creds(struct fuse_conn *fc, struct fuse_req *req)
-+static void fuse_force_creds(struct fuse_req *req)
- {
-+ struct fuse_conn *fc = req->fc;
-+
- req->in.h.uid = from_kuid_munged(fc->user_ns, current_fsuid());
- req->in.h.gid = from_kgid_munged(fc->user_ns, current_fsgid());
- req->in.h.pid = pid_nr_ns(task_pid(current), fc->pid_ns);
-@@ -484,7 +492,7 @@ ssize_t fuse_simple_request(struct fuse_conn *fc, struct fuse_args *args)
- req = fuse_request_alloc(fc, GFP_KERNEL | __GFP_NOFAIL);
-
- if (!args->nocreds)
-- fuse_force_creds(fc, req);
-+ fuse_force_creds(req);
-
- __set_bit(FR_WAITING, &req->flags);
- __set_bit(FR_FORCE, &req->flags);
-@@ -501,20 +509,20 @@ ssize_t fuse_simple_request(struct fuse_conn *fc, struct fuse_args *args)
-
- if (!args->noreply)
- __set_bit(FR_ISREPLY, &req->flags);
-- __fuse_request_send(fc, req);
-+ __fuse_request_send(req);
- ret = req->out.h.error;
- if (!ret && args->out_argvar) {
- BUG_ON(args->out_numargs == 0);
- ret = args->out_args[args->out_numargs - 1].size;
- }
-- fuse_put_request(fc, req);
-+ fuse_put_request(req);
-
- return ret;
- }
-
--static bool fuse_request_queue_background(struct fuse_conn *fc,
-- struct fuse_req *req)
-+static bool fuse_request_queue_background(struct fuse_req *req)
- {
-+ struct fuse_conn *fc = req->fc;
- bool queued = false;
-
- WARN_ON(!test_bit(FR_BACKGROUND, &req->flags));
-@@ -561,8 +569,8 @@ int fuse_simple_background(struct fuse_conn *fc, struct fuse_args *args,
-
- fuse_args_to_req(req, args);
-
-- if (!fuse_request_queue_background(fc, req)) {
-- fuse_put_request(fc, req);
-+ if (!fuse_request_queue_background(req)) {
-+ fuse_put_request(req);
- return -ENOTCONN;
- }
-
-@@ -592,7 +600,7 @@ static int fuse_simple_notify_reply(struct fuse_conn *fc,
- } else {
- err = -ENODEV;
- spin_unlock(&fiq->lock);
-- fuse_put_request(fc, req);
-+ fuse_put_request(req);
- }
-
- return err;
-@@ -1277,7 +1285,7 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file,
- /* SETXATTR is special, since it may contain too large data */
- if (args->opcode == FUSE_SETXATTR)
- req->out.h.error = -E2BIG;
-- fuse_request_end(fc, req);
-+ fuse_request_end(req);
- goto restart;
- }
- spin_lock(&fpq->lock);
-@@ -1320,8 +1328,8 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file,
- /* matches barrier in request_wait_answer() */
- smp_mb__after_atomic();
- if (test_bit(FR_INTERRUPTED, &req->flags))
-- queue_interrupt(fiq, req);
-- fuse_put_request(fc, req);
-+ queue_interrupt(req);
-+ fuse_put_request(req);
-
- return reqsize;
-
-@@ -1329,7 +1337,7 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file,
- if (!test_bit(FR_PRIVATE, &req->flags))
- list_del_init(&req->list);
- spin_unlock(&fpq->lock);
-- fuse_request_end(fc, req);
-+ fuse_request_end(req);
- return err;
-
- err_unlock:
-@@ -1911,9 +1919,9 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud,
- else if (oh.error == -ENOSYS)
- fc->no_interrupt = 1;
- else if (oh.error == -EAGAIN)
-- err = queue_interrupt(&fc->iq, req);
-+ err = queue_interrupt(req);
-
-- fuse_put_request(fc, req);
-+ fuse_put_request(req);
-
- goto copy_finish;
- }
-@@ -1943,7 +1951,7 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud,
- list_del_init(&req->list);
- spin_unlock(&fpq->lock);
-
-- fuse_request_end(fc, req);
-+ fuse_request_end(req);
- out:
- return err ? err : nbytes;
-
-@@ -2079,7 +2087,7 @@ static __poll_t fuse_dev_poll(struct file *file, poll_table *wait)
- }
-
- /* Abort all requests on the given list (pending or processing) */
--static void end_requests(struct fuse_conn *fc, struct list_head *head)
-+static void end_requests(struct list_head *head)
- {
- while (!list_empty(head)) {
- struct fuse_req *req;
-@@ -2087,7 +2095,7 @@ static void end_requests(struct fuse_conn *fc, struct list_head *head)
- req->out.h.error = -ECONNABORTED;
- clear_bit(FR_SENT, &req->flags);
- list_del_init(&req->list);
-- fuse_request_end(fc, req);
-+ fuse_request_end(req);
- }
- }
-
-@@ -2182,7 +2190,7 @@ void fuse_abort_conn(struct fuse_conn *fc)
- wake_up_all(&fc->blocked_waitq);
- spin_unlock(&fc->lock);
-
-- end_requests(fc, &to_end);
-+ end_requests(&to_end);
- } else {
- spin_unlock(&fc->lock);
- }
-@@ -2212,7 +2220,7 @@ int fuse_dev_release(struct inode *inode, struct file *file)
- list_splice_init(&fpq->processing[i], &to_end);
- spin_unlock(&fpq->lock);
-
-- end_requests(fc, &to_end);
-+ end_requests(&to_end);
-
- /* Are we the last open device? */
- if (atomic_dec_and_test(&fc->dev_count)) {
-diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
-index 7138b780c9abd..b7bd2e623c3f3 100644
---- a/fs/fuse/fuse_i.h
-+++ b/fs/fuse/fuse_i.h
-@@ -941,7 +941,7 @@ int fuse_simple_background(struct fuse_conn *fc, struct fuse_args *args,
- /**
- * End a finished request
- */
--void fuse_request_end(struct fuse_conn *fc, struct fuse_req *req);
-+void fuse_request_end(struct fuse_req *req);
-
- /* Abort all requests */
- void fuse_abort_conn(struct fuse_conn *fc);
-diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c
-index fadf6fb90fe22..8865ab961abfe 100644
---- a/fs/fuse/virtio_fs.c
-+++ b/fs/fuse/virtio_fs.c
-@@ -268,7 +268,6 @@ static void virtio_fs_request_dispatch_work(struct work_struct *work)
- struct fuse_req *req;
- struct virtio_fs_vq *fsvq = container_of(work, struct virtio_fs_vq,
- dispatch_work.work);
-- struct fuse_conn *fc = fsvq->fud->fc;
- int ret;
-
- pr_debug("virtio-fs: worker %s called.\n", __func__);
-@@ -283,7 +282,7 @@ static void virtio_fs_request_dispatch_work(struct work_struct *work)
-
- list_del_init(&req->list);
- spin_unlock(&fsvq->lock);
-- fuse_request_end(fc, req);
-+ fuse_request_end(req);
- }
-
- /* Dispatch pending requests */
-@@ -314,7 +313,7 @@ static void virtio_fs_request_dispatch_work(struct work_struct *work)
- spin_unlock(&fsvq->lock);
- pr_err("virtio-fs: virtio_fs_enqueue_req() failed %d\n",
- ret);
-- fuse_request_end(fc, req);
-+ fuse_request_end(req);
- }
- }
- }
-@@ -453,7 +452,6 @@ static void virtio_fs_request_complete(struct fuse_req *req,
- struct virtio_fs_vq *fsvq)
- {
- struct fuse_pqueue *fpq = &fsvq->fud->pq;
-- struct fuse_conn *fc = fsvq->fud->fc;
- struct fuse_args *args;
- struct fuse_args_pages *ap;
- unsigned int len, i, thislen;
-@@ -486,7 +484,7 @@ static void virtio_fs_request_complete(struct fuse_req *req,
- clear_bit(FR_SENT, &req->flags);
- spin_unlock(&fpq->lock);
-
-- fuse_request_end(fc, req);
-+ fuse_request_end(req);
- spin_lock(&fsvq->lock);
- dec_in_flight_req(fsvq);
- spin_unlock(&fsvq->lock);
---
-2.43.0
-
+++ /dev/null
-From 437aa1e2b0ce897e451b5a41c9a5a3db6aa9f7e8 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 20 Apr 2020 17:54:38 +0200
-Subject: fuse: store fuse_conn in fuse_req
-
-From: Max Reitz <mreitz@redhat.com>
-
-[ Upstream commit 24754db2728a87c513cc480c70c09072a7a40ba6 ]
-
-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.
-
-Signed-off-by: Max Reitz <mreitz@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
-Stable-dep-of: b1fe686a765e ("fuse: don't unhash root")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/fuse/dev.c | 13 +++++++------
- fs/fuse/fuse_i.h | 3 +++
- 2 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
-index ac6a8da340139..185cae8a7ce11 100644
---- a/fs/fuse/dev.c
-+++ b/fs/fuse/dev.c
-@@ -40,20 +40,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;
- }
-@@ -125,7 +126,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)
-@@ -480,7 +481,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);
-@@ -547,7 +548,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);
-diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
-index 83c2855bc7406..7138b780c9abd 100644
---- a/fs/fuse/fuse_i.h
-+++ b/fs/fuse/fuse_i.h
-@@ -363,6 +363,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;
---
-2.43.0
-
projects / thirdparty / kernel / stable-queue.git / commitdiff
