diff options
author | Christoph Hellwig <hch@lst.de> | 2019-07-24 03:15:25 -0400 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2019-09-15 16:42:33 -0400 |
commit | 61b875e88a04fd626e68c657400f237af8afa95e (patch) | |
tree | 649e05ab656c518c00688ee5fbf4ebfeb49d11e1 /fs/jffs2/fs.c | |
parent | f2538f999345405f7d2e1194c0c8efa4e11f7b3a (diff) |
jffs2: Remove jffs2_gc_fetch_page and jffs2_gc_release_page
Merge these two helpers into the only callers to get rid of some
amazingly bad calling conventions.
Suggested-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs/jffs2/fs.c')
-rw-r--r-- | fs/jffs2/fs.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c index 8a20ddd25f2d..a3193c0f3a9b 100644 --- a/fs/jffs2/fs.c +++ b/fs/jffs2/fs.c | |||
@@ -678,33 +678,6 @@ struct jffs2_inode_info *jffs2_gc_fetch_inode(struct jffs2_sb_info *c, | |||
678 | return JFFS2_INODE_INFO(inode); | 678 | return JFFS2_INODE_INFO(inode); |
679 | } | 679 | } |
680 | 680 | ||
681 | unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c, | ||
682 | struct jffs2_inode_info *f, | ||
683 | unsigned long offset, | ||
684 | unsigned long *priv) | ||
685 | { | ||
686 | struct inode *inode = OFNI_EDONI_2SFFJ(f); | ||
687 | struct page *pg; | ||
688 | |||
689 | pg = read_cache_page(inode->i_mapping, offset >> PAGE_SHIFT, | ||
690 | jffs2_do_readpage_unlock, inode); | ||
691 | if (IS_ERR(pg)) | ||
692 | return (void *)pg; | ||
693 | |||
694 | *priv = (unsigned long)pg; | ||
695 | return kmap(pg); | ||
696 | } | ||
697 | |||
698 | void jffs2_gc_release_page(struct jffs2_sb_info *c, | ||
699 | unsigned char *ptr, | ||
700 | unsigned long *priv) | ||
701 | { | ||
702 | struct page *pg = (void *)*priv; | ||
703 | |||
704 | kunmap(pg); | ||
705 | put_page(pg); | ||
706 | } | ||
707 | |||
708 | static int jffs2_flash_setup(struct jffs2_sb_info *c) { | 681 | static int jffs2_flash_setup(struct jffs2_sb_info *c) { |
709 | int ret = 0; | 682 | int ret = 0; |
710 | 683 | ||