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>

3 files changed, 13 insertions, 38 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,
         return JFFS2_INODE_INFO(inode);
 }
 
-unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c,
-                                   struct jffs2_inode_info *f,
-                                   unsigned long offset,
-                                   unsigned long *priv)
-{
-        struct inode *inode = OFNI_EDONI_2SFFJ(f);
-        struct page *pg;
-
-        pg = read_cache_page(inode->i_mapping, offset >> PAGE_SHIFT,
-                             jffs2_do_readpage_unlock, inode);
-        if (IS_ERR(pg))
-                return (void *)pg;
-
-        *priv = (unsigned long)pg;
-        return kmap(pg);
-}
-
-void jffs2_gc_release_page(struct jffs2_sb_info *c,
-                           unsigned char *ptr,
-                           unsigned long *priv)
-{
-        struct page *pg = (void *)*priv;
-
-        kunmap(pg);
-        put_page(pg);
-}
-
 static int jffs2_flash_setup(struct jffs2_sb_info *c) {
         int ret = 0;
 
diff --git a/fs/jffs2/gc.c b/fs/jffs2/gc.c
index 9ed0f26cf023..373b3b7c9f44 100644
--- a/fs/jffs2/gc.c
+++ b/fs/jffs2/gc.c
@@ -1165,12 +1165,13 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era
                                        struct jffs2_inode_info *f, struct jffs2_full_dnode *fn,
                                        uint32_t start, uint32_t end)
 {
+        struct inode *inode = OFNI_EDONI_2SFFJ(f);
         struct jffs2_full_dnode *new_fn;
         struct jffs2_raw_inode ri;
         uint32_t alloclen, offset, orig_end, orig_start;
         int ret = 0;
         unsigned char *comprbuf = NULL, *writebuf;
-        unsigned long pg;
+        struct page *page;
         unsigned char *pg_ptr;
 
         memset(&ri, 0, sizeof(ri));
@@ -1325,15 +1326,18 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era
          * end up here trying to GC the *same* page that jffs2_write_begin() is
          * trying to write out, read_cache_page() will not deadlock. */
         mutex_unlock(&f->sem);
-        pg_ptr = jffs2_gc_fetch_page(c, f, start, &pg);
-        mutex_lock(&f->sem);
-
-        if (IS_ERR(pg_ptr)) {
+        page = read_cache_page(inode->i_mapping, start >> PAGE_SHIFT,
+                               jffs2_do_readpage_unlock, inode);
+        if (IS_ERR(page)) {
                 pr_warn("read_cache_page() returned error: %ld\n",
-                        PTR_ERR(pg_ptr));
-                return PTR_ERR(pg_ptr);
+                        PTR_ERR(page));
+                mutex_lock(&f->sem);
+                return PTR_ERR(page);
         }
 
+        pg_ptr = kmap(page);
+        mutex_lock(&f->sem);
+
         offset = start;
         while(offset < orig_end) {
                 uint32_t datalen;
@@ -1396,6 +1400,7 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era
                 }
         }
 
-        jffs2_gc_release_page(c, pg_ptr, &pg);
+        kunmap(page);
+        put_page(page);
         return ret;
 }
diff --git a/fs/jffs2/os-linux.h b/fs/jffs2/os-linux.h
index bd3d5f0ddc34..f4895dda26a3 100644
--- a/fs/jffs2/os-linux.h
+++ b/fs/jffs2/os-linux.h
@@ -183,9 +183,6 @@ unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c,
                                    struct jffs2_inode_info *f,
                                    unsigned long offset,
                                    unsigned long *priv);
-void jffs2_gc_release_page(struct jffs2_sb_info *c,
-                           unsigned char *pg,
-                           unsigned long *priv);
 void jffs2_flash_cleanup(struct jffs2_sb_info *c);