From: Vivek Goyal <vgoyal@redhat.com> To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, miklos@szeredi.hu Cc: virtio-fs@redhat.com, vgoyal@redhat.com, stefanha@redhat.com, dgilbert@redhat.com Subject: [PATCH 07/13] Export fuse_dequeue_forget() function Date: Wed, 21 Aug 2019 13:37:36 -0400 [thread overview] Message-ID: <20190821173742.24574-8-vgoyal@redhat.com> (raw) In-Reply-To: <20190821173742.24574-1-vgoyal@redhat.com> File systems like virtio-fs need to do not have to play directly with forget list data structures. There is a helper function use that instead. Rename dequeue_forget() to fuse_dequeue_forget() and export it so that stacked filesystems can use it. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> --- fs/fuse/dev.c | 9 +++++---- fs/fuse/fuse_i.h | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 6215bc7d4255..2bbfc1f77875 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -1185,7 +1185,7 @@ __releases(fiq->waitq.lock) return err ? err : reqsize; } -static struct fuse_forget_link *dequeue_forget(struct fuse_iqueue *fiq, +struct fuse_forget_link *fuse_dequeue_forget(struct fuse_iqueue *fiq, unsigned max, unsigned *countp) { @@ -1206,6 +1206,7 @@ static struct fuse_forget_link *dequeue_forget(struct fuse_iqueue *fiq, return head; } +EXPORT_SYMBOL(fuse_dequeue_forget); static int fuse_read_single_forget(struct fuse_iqueue *fiq, struct fuse_copy_state *cs, @@ -1213,7 +1214,7 @@ static int fuse_read_single_forget(struct fuse_iqueue *fiq, __releases(fiq->waitq.lock) { int err; - struct fuse_forget_link *forget = dequeue_forget(fiq, 1, NULL); + struct fuse_forget_link *forget = fuse_dequeue_forget(fiq, 1, NULL); struct fuse_forget_in arg = { .nlookup = forget->forget_one.nlookup, }; @@ -1261,7 +1262,7 @@ __releases(fiq->waitq.lock) } max_forgets = (nbytes - ih.len) / sizeof(struct fuse_forget_one); - head = dequeue_forget(fiq, max_forgets, &count); + head = fuse_dequeue_forget(fiq, max_forgets, &count); spin_unlock(&fiq->waitq.lock); arg.count = count; @@ -2231,7 +2232,7 @@ void fuse_abort_conn(struct fuse_conn *fc) clear_bit(FR_PENDING, &req->flags); list_splice_tail_init(&fiq->pending, &to_end); while (forget_pending(fiq)) - kfree(dequeue_forget(fiq, 1, NULL)); + kfree(fuse_dequeue_forget(fiq, 1, NULL)); wake_up_all_locked(&fiq->waitq); spin_unlock(&fiq->waitq.lock); kill_fasync(&fiq->fasync, SIGIO, POLL_IN); diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 7da756e2859e..d4b27f048d81 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -820,6 +820,9 @@ void fuse_queue_forget(struct fuse_conn *fc, struct fuse_forget_link *forget, struct fuse_forget_link *fuse_alloc_forget(void); +struct fuse_forget_link *fuse_dequeue_forget(struct fuse_iqueue *fiq, + unsigned max, unsigned *countp); + /* Used by READDIRPLUS */ void fuse_force_forget(struct file *file, u64 nodeid); -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Vivek Goyal <vgoyal@redhat.com> To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, miklos@szeredi.hu Cc: virtio-fs@redhat.com, vgoyal@redhat.com Subject: [Virtio-fs] [PATCH 07/13] Export fuse_dequeue_forget() function Date: Wed, 21 Aug 2019 13:37:36 -0400 [thread overview] Message-ID: <20190821173742.24574-8-vgoyal@redhat.com> (raw) In-Reply-To: <20190821173742.24574-1-vgoyal@redhat.com> File systems like virtio-fs need to do not have to play directly with forget list data structures. There is a helper function use that instead. Rename dequeue_forget() to fuse_dequeue_forget() and export it so that stacked filesystems can use it. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> --- fs/fuse/dev.c | 9 +++++---- fs/fuse/fuse_i.h | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 6215bc7d4255..2bbfc1f77875 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -1185,7 +1185,7 @@ __releases(fiq->waitq.lock) return err ? err : reqsize; } -static struct fuse_forget_link *dequeue_forget(struct fuse_iqueue *fiq, +struct fuse_forget_link *fuse_dequeue_forget(struct fuse_iqueue *fiq, unsigned max, unsigned *countp) { @@ -1206,6 +1206,7 @@ static struct fuse_forget_link *dequeue_forget(struct fuse_iqueue *fiq, return head; } +EXPORT_SYMBOL(fuse_dequeue_forget); static int fuse_read_single_forget(struct fuse_iqueue *fiq, struct fuse_copy_state *cs, @@ -1213,7 +1214,7 @@ static int fuse_read_single_forget(struct fuse_iqueue *fiq, __releases(fiq->waitq.lock) { int err; - struct fuse_forget_link *forget = dequeue_forget(fiq, 1, NULL); + struct fuse_forget_link *forget = fuse_dequeue_forget(fiq, 1, NULL); struct fuse_forget_in arg = { .nlookup = forget->forget_one.nlookup, }; @@ -1261,7 +1262,7 @@ __releases(fiq->waitq.lock) } max_forgets = (nbytes - ih.len) / sizeof(struct fuse_forget_one); - head = dequeue_forget(fiq, max_forgets, &count); + head = fuse_dequeue_forget(fiq, max_forgets, &count); spin_unlock(&fiq->waitq.lock); arg.count = count; @@ -2231,7 +2232,7 @@ void fuse_abort_conn(struct fuse_conn *fc) clear_bit(FR_PENDING, &req->flags); list_splice_tail_init(&fiq->pending, &to_end); while (forget_pending(fiq)) - kfree(dequeue_forget(fiq, 1, NULL)); + kfree(fuse_dequeue_forget(fiq, 1, NULL)); wake_up_all_locked(&fiq->waitq); spin_unlock(&fiq->waitq.lock); kill_fasync(&fiq->fasync, SIGIO, POLL_IN); diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 7da756e2859e..d4b27f048d81 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -820,6 +820,9 @@ void fuse_queue_forget(struct fuse_conn *fc, struct fuse_forget_link *forget, struct fuse_forget_link *fuse_alloc_forget(void); +struct fuse_forget_link *fuse_dequeue_forget(struct fuse_iqueue *fiq, + unsigned max, unsigned *countp); + /* Used by READDIRPLUS */ void fuse_force_forget(struct file *file, u64 nodeid); -- 2.20.1
next prev parent reply other threads:[~2019-08-21 17:39 UTC|newest] Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-21 17:37 [PATCH v3 00/13] virtio-fs: shared file system for virtual machines Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 01/13] fuse: delete dentry if timeout is zero Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 02/13] fuse: Use default_file_splice_read for direct IO Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-28 7:45 ` Miklos Szeredi 2019-08-28 7:45 ` [Virtio-fs] " Miklos Szeredi 2019-08-28 12:27 ` Vivek Goyal 2019-08-28 12:27 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 03/13] fuse: export fuse_end_request() Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 04/13] fuse: export fuse_len_args() Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 05/13] fuse: Export fuse_send_init_request() Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 06/13] fuse: export fuse_get_unique() Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` Vivek Goyal [this message] 2019-08-21 17:37 ` [Virtio-fs] [PATCH 07/13] Export fuse_dequeue_forget() function Vivek Goyal 2019-08-21 17:37 ` [PATCH 08/13] fuse: extract fuse_fill_super_common() Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 09/13] fuse: add fuse_iqueue_ops callbacks Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 10/13] fuse: Separate fuse device allocation and installation in fuse_conn Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 11/13] virtio_fs: add skeleton virtio_fs.ko module Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 12/13] virtio-fs: Do not provide abort interface in fusectl Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-21 17:37 ` [PATCH 13/13] init/do_mounts.c: add virtio_fs root fs support Vivek Goyal 2019-08-21 17:37 ` [Virtio-fs] " Vivek Goyal 2019-08-29 9:28 ` [PATCH v3 00/13] virtio-fs: shared file system for virtual machines Miklos Szeredi 2019-08-29 9:28 ` [Virtio-fs] " Miklos Szeredi 2019-08-29 11:58 ` Vivek Goyal 2019-08-29 11:58 ` [Virtio-fs] " Vivek Goyal 2019-08-29 12:35 ` Stefan Hajnoczi 2019-08-29 12:35 ` [Virtio-fs] " Stefan Hajnoczi 2019-08-29 13:29 ` Vivek Goyal 2019-08-29 13:29 ` [Virtio-fs] " Vivek Goyal 2019-08-29 13:41 ` Miklos Szeredi 2019-08-29 13:41 ` [Virtio-fs] " Miklos Szeredi 2019-08-29 14:31 ` Vivek Goyal 2019-08-29 14:31 ` [Virtio-fs] " Vivek Goyal 2019-08-29 14:47 ` Miklos Szeredi 2019-08-29 14:47 ` [Virtio-fs] " Miklos Szeredi 2019-08-29 16:01 ` Vivek Goyal 2019-08-29 16:01 ` [Virtio-fs] " Vivek Goyal 2019-08-31 5:46 ` Miklos Szeredi 2019-08-31 5:46 ` [Virtio-fs] " Miklos Szeredi 2019-09-03 8:05 ` Miklos Szeredi 2019-09-03 8:05 ` [Virtio-fs] " Miklos Szeredi 2019-09-03 8:31 ` Michael S. Tsirkin 2019-09-03 8:31 ` Michael S. Tsirkin 2019-09-03 8:31 ` [Virtio-fs] " Michael S. Tsirkin 2019-09-03 9:17 ` Miklos Szeredi 2019-09-03 9:17 ` [Virtio-fs] " Miklos Szeredi 2019-09-04 15:54 ` Stefan Hajnoczi 2019-09-04 15:54 ` [Virtio-fs] " Stefan Hajnoczi 2019-09-04 15:54 ` Stefan Hajnoczi 2019-09-03 14:07 ` Vivek Goyal 2019-09-03 14:07 ` [Virtio-fs] " Vivek Goyal 2019-09-03 14:12 ` Michael S. Tsirkin 2019-09-03 14:12 ` [Virtio-fs] " Michael S. Tsirkin 2019-09-03 14:18 ` Vivek Goyal 2019-09-03 14:18 ` [Virtio-fs] " Vivek Goyal 2019-09-03 17:15 ` Michael S. Tsirkin 2019-09-03 17:15 ` [Virtio-fs] " Michael S. Tsirkin 2019-09-03 17:15 ` Michael S. Tsirkin 2019-09-03 14:18 ` Vivek Goyal 2019-09-03 14:12 ` Michael S. Tsirkin 2019-09-03 14:07 ` Vivek Goyal
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190821173742.24574-8-vgoyal@redhat.com \ --to=vgoyal@redhat.com \ --cc=dgilbert@redhat.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=miklos@szeredi.hu \ --cc=stefanha@redhat.com \ --cc=virtio-fs@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.