| Message ID | 20190822000933.180870-3-khazhy@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] fuse: on 64-bit store time in d_fsdata directly | expand |
On Wed, Aug 21, 2019 at 5:10 PM Khazhismel Kumykov <khazhy@google.com> wrote: > > Instead of having a helper per flag > > Signed-off-by: Khazhismel Kumykov <khazhy@google.com> I think it would be better to re-order the patch 2 and 3 of this series. There will be less code churn. > --- > fs/fuse/dev.c | 22 +++------------------- > fs/fuse/file.c | 6 +++--- > fs/fuse/fuse_i.h | 6 +----- > fs/fuse/inode.c | 4 ++-- > 4 files changed, 9 insertions(+), 29 deletions(-) > > diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c > index a0d166a6596f..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,24 +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_account(unsigned int npages) > -{ > - return __fuse_request_alloc(npages, GFP_KERNEL_ACCOUNT); > -} > -EXPORT_SYMBOL_GPL(fuse_request_alloc_account); > - > -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) > @@ -207,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) > @@ -316,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 c584ad7478b3..ae8c8016bb8e 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_account(0); > + ff->reserved_req = fuse_request_alloc(0, GFP_KERNEL_ACCOUNT); > 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 08161b2d9b08..8080a51096e9 100644 > --- a/fs/fuse/fuse_i.h > +++ b/fs/fuse/fuse_i.h > @@ -902,11 +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_account(unsigned int 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 eab44ddc68b9..ad92e93eaddd 100644 > --- a/fs/fuse/inode.c > +++ b/fs/fuse/inode.c > @@ -1178,13 +1178,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 >
On Wed, Aug 21, 2019 at 5:18 PM Shakeel Butt <shakeelb@google.com> wrote: > > On Wed, Aug 21, 2019 at 5:10 PM Khazhismel Kumykov <khazhy@google.com> wrote: > > > > Instead of having a helper per flag > > > > Signed-off-by: Khazhismel Kumykov <khazhy@google.com> > > I think it would be better to re-order the patch 2 and 3 of this > series. There will be less code churn. That makes sense to me, I'll follow up with a v2
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index a0d166a6596f..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,24 +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_account(unsigned int npages) -{ - return __fuse_request_alloc(npages, GFP_KERNEL_ACCOUNT); -} -EXPORT_SYMBOL_GPL(fuse_request_alloc_account); - -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) @@ -207,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) @@ -316,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 c584ad7478b3..ae8c8016bb8e 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_account(0); + ff->reserved_req = fuse_request_alloc(0, GFP_KERNEL_ACCOUNT); 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 08161b2d9b08..8080a51096e9 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -902,11 +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_account(unsigned int 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 eab44ddc68b9..ad92e93eaddd 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -1178,13 +1178,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; }
Instead of having a helper per flag Signed-off-by: Khazhismel Kumykov <khazhy@google.com> --- fs/fuse/dev.c | 22 +++------------------- fs/fuse/file.c | 6 +++--- fs/fuse/fuse_i.h | 6 +----- fs/fuse/inode.c | 4 ++-- 4 files changed, 9 insertions(+), 29 deletions(-)