From: Shakeel Butt <shakeelb@google.com>
To: Khazhismel Kumykov <khazhy@google.com>
Cc: miklos@szeredi.hu, linux-fsdevel <linux-fsdevel@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 2/3] fuse: pass gfp flags to fuse_request_alloc
Date: Thu, 22 Aug 2019 14:42:05 -0700 [thread overview]
Message-ID: <CALvZod6DB5PfGuGcks2Xr7PTrDwdUFnkgwsfBvAxYds5EX2wRA@mail.gmail.com> (raw)
In-Reply-To: <20190822200030.141272-2-khazhy@google.com>
On Thu, Aug 22, 2019 at 1:00 PM Khazhismel Kumykov <khazhy@google.com> wrote:
>
> Instead of having a helper per flag
>
> Signed-off-by: Khazhismel Kumykov <khazhy@google.com>
Reviewed-by: Shakeel Butt <shakeelb@google.com>
> ---
> fs/fuse/dev.c | 16 +++-------------
> fs/fuse/file.c | 6 +++---
> fs/fuse/fuse_i.h | 4 +---
> fs/fuse/inode.c | 4 ++--
> 4 files changed, 9 insertions(+), 21 deletions(-)
>
> diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
> index ea8237513dfa..c957620ce7ba 100644
> --- a/fs/fuse/dev.c
> +++ b/fs/fuse/dev.c
> @@ -66,7 +66,7 @@ static struct page **fuse_req_pages_alloc(unsigned int npages, gfp_t flags,
> return pages;
> }
>
> -static struct fuse_req *__fuse_request_alloc(unsigned npages, gfp_t flags)
> +struct fuse_req *fuse_request_alloc(unsigned int npages, gfp_t flags)
> {
> struct fuse_req *req = kmem_cache_zalloc(fuse_req_cachep, flags);
> if (req) {
> @@ -90,18 +90,8 @@ static struct fuse_req *__fuse_request_alloc(unsigned npages, gfp_t flags)
> }
> return req;
> }
> -
> -struct fuse_req *fuse_request_alloc(unsigned npages)
> -{
> - return __fuse_request_alloc(npages, GFP_KERNEL);
> -}
> EXPORT_SYMBOL_GPL(fuse_request_alloc);
>
> -struct fuse_req *fuse_request_alloc_nofs(unsigned npages)
> -{
> - return __fuse_request_alloc(npages, GFP_NOFS);
> -}
> -
> static void fuse_req_pages_free(struct fuse_req *req)
> {
> if (req->pages != req->inline_pages)
> @@ -201,7 +191,7 @@ static struct fuse_req *__fuse_get_req(struct fuse_conn *fc, unsigned npages,
> if (fc->conn_error)
> goto out;
>
> - req = fuse_request_alloc(npages);
> + req = fuse_request_alloc(npages, GFP_KERNEL);
> err = -ENOMEM;
> if (!req) {
> if (for_background)
> @@ -310,7 +300,7 @@ struct fuse_req *fuse_get_req_nofail_nopages(struct fuse_conn *fc,
> wait_event(fc->blocked_waitq, fc->initialized);
> /* Matches smp_wmb() in fuse_set_initialized() */
> smp_rmb();
> - req = fuse_request_alloc(0);
> + req = fuse_request_alloc(0, GFP_KERNEL);
> if (!req)
> req = get_reserved_req(fc, file);
>
> diff --git a/fs/fuse/file.c b/fs/fuse/file.c
> index 5ae2828beb00..572d8347ebcb 100644
> --- a/fs/fuse/file.c
> +++ b/fs/fuse/file.c
> @@ -50,7 +50,7 @@ struct fuse_file *fuse_file_alloc(struct fuse_conn *fc)
> return NULL;
>
> ff->fc = fc;
> - ff->reserved_req = fuse_request_alloc(0);
> + ff->reserved_req = fuse_request_alloc(0, GFP_KERNEL);
> if (unlikely(!ff->reserved_req)) {
> kfree(ff);
> return NULL;
> @@ -1703,7 +1703,7 @@ static int fuse_writepage_locked(struct page *page)
>
> set_page_writeback(page);
>
> - req = fuse_request_alloc_nofs(1);
> + req = fuse_request_alloc(1, GFP_NOFS);
> if (!req)
> goto err;
>
> @@ -1923,7 +1923,7 @@ static int fuse_writepages_fill(struct page *page,
> struct fuse_inode *fi = get_fuse_inode(inode);
>
> err = -ENOMEM;
> - req = fuse_request_alloc_nofs(FUSE_REQ_INLINE_PAGES);
> + req = fuse_request_alloc(FUSE_REQ_INLINE_PAGES, GFP_NOFS);
> if (!req) {
> __free_page(tmp_page);
> goto out_unlock;
> diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
> index 24dbca777775..8080a51096e9 100644
> --- a/fs/fuse/fuse_i.h
> +++ b/fs/fuse/fuse_i.h
> @@ -902,9 +902,7 @@ void __exit fuse_ctl_cleanup(void);
> /**
> * Allocate a request
> */
> -struct fuse_req *fuse_request_alloc(unsigned npages);
> -
> -struct fuse_req *fuse_request_alloc_nofs(unsigned npages);
> +struct fuse_req *fuse_request_alloc(unsigned int npages, gfp_t flags);
>
> bool fuse_req_realloc_pages(struct fuse_conn *fc, struct fuse_req *req,
> gfp_t flags);
> diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
> index 4bb885b0f032..5afd1872b8b1 100644
> --- a/fs/fuse/inode.c
> +++ b/fs/fuse/inode.c
> @@ -1177,13 +1177,13 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)
> /* Root dentry doesn't have .d_revalidate */
> sb->s_d_op = &fuse_dentry_operations;
>
> - init_req = fuse_request_alloc(0);
> + init_req = fuse_request_alloc(0, GFP_KERNEL);
> if (!init_req)
> goto err_put_root;
> __set_bit(FR_BACKGROUND, &init_req->flags);
>
> if (is_bdev) {
> - fc->destroy_req = fuse_request_alloc(0);
> + fc->destroy_req = fuse_request_alloc(0, GFP_KERNEL);
> if (!fc->destroy_req)
> goto err_free_init_req;
> }
> --
> 2.23.0.187.g17f5b7556c-goog
>
next prev parent reply other threads:[~2019-08-22 21:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-22 20:00 [PATCH v2 1/3] fuse: on 64-bit store time in d_fsdata directly Khazhismel Kumykov
2019-08-22 20:00 ` [PATCH v2 2/3] fuse: pass gfp flags to fuse_request_alloc Khazhismel Kumykov
2019-08-22 21:42 ` Shakeel Butt [this message]
2019-08-22 20:00 ` [PATCH v2 3/3] fuse: kmemcg account fs data Khazhismel Kumykov
2019-08-22 21:43 ` Shakeel Butt
2019-09-03 21:08 ` [PATCH v2 1/3] fuse: on 64-bit store time in d_fsdata directly Khazhismel Kumykov
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=CALvZod6DB5PfGuGcks2Xr7PTrDwdUFnkgwsfBvAxYds5EX2wRA@mail.gmail.com \
--to=shakeelb@google.com \
--cc=khazhy@google.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=miklos@szeredi.hu \
/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: link
Be 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.