From 7213394c4e184b002d8011c13d916e7ac6d17520 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Tue, 10 Sep 2019 15:04:11 +0200 Subject: [PATCH] fuse: simplify request allocation Page arrays are not allocated together with the request anymore. Get rid of the dead code Signed-off-by: Miklos Szeredi --- fs/fuse/dev.c | 61 +++++++++--------------------------------------- fs/fuse/file.c | 4 ++-- fs/fuse/fuse_i.h | 7 ------ 3 files changed, 13 insertions(+), 59 deletions(-) diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 1ff18d319949..f240d541edfc 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -40,59 +40,26 @@ 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, struct page **pages, - struct fuse_page_desc *page_descs, - unsigned npages) +static void fuse_request_init(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); - req->pages = pages; - req->page_descs = page_descs; - req->max_pages = npages; __set_bit(FR_PENDING, &req->flags); } -static struct fuse_req *__fuse_request_alloc(unsigned npages, gfp_t flags) +static struct fuse_req *fuse_request_alloc(gfp_t flags) { struct fuse_req *req = kmem_cache_zalloc(fuse_req_cachep, flags); - if (req) { - struct page **pages = NULL; - struct fuse_page_desc *page_descs = NULL; + if (req) + fuse_request_init(req); - WARN_ON(npages > FUSE_MAX_MAX_PAGES); - if (npages > FUSE_REQ_INLINE_PAGES) { - pages = fuse_pages_alloc(npages, flags, &page_descs); - if (!pages) { - kmem_cache_free(fuse_req_cachep, req); - return NULL; - } - __set_bit(FR_ALLOC_PAGES, &req->flags); - } else if (npages) { - pages = req->inline_pages; - page_descs = req->inline_page_descs; - } - - fuse_request_init(req, pages, page_descs, npages); - } return req; } -static struct fuse_req *fuse_request_alloc(unsigned int npages) -{ - return __fuse_request_alloc(npages, GFP_KERNEL); -} - -static void fuse_req_pages_free(struct fuse_req *req) -{ - if (test_bit(FR_ALLOC_PAGES, &req->flags)) - kfree(req->pages); -} - static void fuse_request_free(struct fuse_req *req) { - fuse_req_pages_free(req); kmem_cache_free(fuse_req_cachep, req); } @@ -135,8 +102,7 @@ static void fuse_drop_waiting(struct fuse_conn *fc) static void fuse_put_request(struct fuse_conn *fc, struct fuse_req *req); -static struct fuse_req *__fuse_get_req(struct fuse_conn *fc, unsigned npages, - bool for_background) +static struct fuse_req *fuse_get_req(struct fuse_conn *fc, bool for_background) { struct fuse_req *req; int err; @@ -159,7 +125,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(GFP_KERNEL); err = -ENOMEM; if (!req) { if (for_background) @@ -187,11 +153,6 @@ static struct fuse_req *__fuse_get_req(struct fuse_conn *fc, unsigned npages, return ERR_PTR(err); } -static struct fuse_req *fuse_get_req(struct fuse_conn *fc, unsigned int npages) -{ - return __fuse_get_req(fc, npages, false); -} - static void fuse_put_request(struct fuse_conn *fc, struct fuse_req *req) { if (refcount_dec_and_test(&req->count)) { @@ -517,7 +478,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(0, GFP_KERNEL | __GFP_NOFAIL); + req = fuse_request_alloc(GFP_KERNEL | __GFP_NOFAIL); if (!args->nocreds) fuse_force_creds(fc, req); @@ -526,7 +487,7 @@ ssize_t fuse_simple_request(struct fuse_conn *fc, struct fuse_args *args) __set_bit(FR_FORCE, &req->flags); } else { WARN_ON(args->nocreds); - req = fuse_get_req(fc, 0); + req = fuse_get_req(fc, false); if (IS_ERR(req)) return PTR_ERR(req); } @@ -597,13 +558,13 @@ int fuse_simple_background(struct fuse_conn *fc, struct fuse_args *args, if (args->force) { WARN_ON(!args->nocreds); - req = __fuse_request_alloc(0, gfp_flags); + req = fuse_request_alloc(gfp_flags); if (!req) return -ENOMEM; __set_bit(FR_BACKGROUND, &req->flags); } else { WARN_ON(args->nocreds); - req = __fuse_get_req(fc, 0, true); + req = fuse_get_req(fc, true); if (IS_ERR(req)) return PTR_ERR(req); } @@ -629,7 +590,7 @@ static int fuse_simple_notify_reply(struct fuse_conn *fc, struct fuse_iqueue *fiq = &fc->iq; int err = 0; - req = fuse_get_req(fc, 0); + req = fuse_get_req(fc, false); if (IS_ERR(req)) return PTR_ERR(req); diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 56ed45ef3058..a2ea347c4d2c 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -19,8 +19,8 @@ #include #include -struct page **fuse_pages_alloc(unsigned int npages, gfp_t flags, - struct fuse_page_desc **desc) +static struct page **fuse_pages_alloc(unsigned int npages, gfp_t flags, + struct fuse_page_desc **desc) { struct page **pages; diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index ffbc2cd649e3..90cb82d5d62d 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -362,7 +362,6 @@ enum fuse_req_flag { FR_SENT, FR_FINISHED, FR_PRIVATE, - FR_ALLOC_PAGES, }; /** @@ -921,12 +920,6 @@ void fuse_dev_cleanup(void); int fuse_ctl_init(void); void __exit fuse_ctl_cleanup(void); -/** - * Allocate a request - */ -struct page **fuse_pages_alloc(unsigned int npages, gfp_t flags, - struct fuse_page_desc **desc); - /** * Simple request sending that does request allocation and freeing */