Merge branch 'for-6.0/dax' into libnvdimm-fixes

[people/ms/linux.git] / fs / squashfs / page_actor.c

diff --git a/fs/squashfs/page_actor.c b/fs/squashfs/page_actor.c
index 520d323a99ce67d4b1a6b53c27e29e40838c1ba9..54b93bf4a25c15b9acb2bf85cbcab6723df89e40 100644 (file)
--- a/fs/squashfs/page_actor.c
+++ b/fs/squashfs/page_actor.c
@@ -7,6 +7,8 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/pagemap.h>
+#include "squashfs_fs_sb.h"
+#include "decompressor.h"
 #include "page_actor.h"
 
 /*
@@ -50,6 +52,7 @@ struct squashfs_page_actor *squashfs_page_actor_init(void **buffer,
        actor->buffer = buffer;
        actor->pages = pages;
        actor->next_page = 0;
+       actor->tmp_buffer = NULL;
        actor->squashfs_first_page = cache_first_page;
        actor->squashfs_next_page = cache_next_page;
        actor->squashfs_finish_page = cache_finish_page;
@@ -57,40 +60,72 @@ struct squashfs_page_actor *squashfs_page_actor_init(void **buffer,
 }
 
 /* Implementation of page_actor for decompressing directly into page cache. */
+static void *handle_next_page(struct squashfs_page_actor *actor)
+{
+       int max_pages = (actor->length + PAGE_SIZE - 1) >> PAGE_SHIFT;
+
+       if (actor->returned_pages == max_pages)
+               return NULL;
+
+       if ((actor->next_page == actor->pages) ||
+                       (actor->next_index != actor->page[actor->next_page]->index)) {
+               actor->next_index++;
+               actor->returned_pages++;
+               return actor->alloc_buffer ? actor->tmp_buffer : ERR_PTR(-ENOMEM);
+       }
+
+       actor->next_index++;
+       actor->returned_pages++;
+       return actor->pageaddr = kmap_local_page(actor->page[actor->next_page++]);
+}
+
 static void *direct_first_page(struct squashfs_page_actor *actor)
 {
-       actor->next_page = 1;
-       return actor->pageaddr = kmap_atomic(actor->page[0]);
+       return handle_next_page(actor);
 }
 
 static void *direct_next_page(struct squashfs_page_actor *actor)
 {
-       if (actor->pageaddr)
-               kunmap_atomic(actor->pageaddr);
+       if (actor->pageaddr) {
+               kunmap_local(actor->pageaddr);
+               actor->pageaddr = NULL;
+       }
 
-       return actor->pageaddr = actor->next_page == actor->pages ? NULL :
-               kmap_atomic(actor->page[actor->next_page++]);
+       return handle_next_page(actor);
 }
 
 static void direct_finish_page(struct squashfs_page_actor *actor)
 {
        if (actor->pageaddr)
-               kunmap_atomic(actor->pageaddr);
+               kunmap_local(actor->pageaddr);
 }
 
-struct squashfs_page_actor *squashfs_page_actor_init_special(struct page **page,
-       int pages, int length)
+struct squashfs_page_actor *squashfs_page_actor_init_special(struct squashfs_sb_info *msblk,
+       struct page **page, int pages, int length)
 {
        struct squashfs_page_actor *actor = kmalloc(sizeof(*actor), GFP_KERNEL);
 
        if (actor == NULL)
                return NULL;
 
+       if (msblk->decompressor->alloc_buffer) {
+               actor->tmp_buffer = kmalloc(PAGE_SIZE, GFP_KERNEL);
+
+               if (actor->tmp_buffer == NULL) {
+                       kfree(actor);
+                       return NULL;
+               }
+       } else
+               actor->tmp_buffer = NULL;
+
        actor->length = length ? : pages * PAGE_SIZE;
        actor->page = page;
        actor->pages = pages;
        actor->next_page = 0;
+       actor->returned_pages = 0;
+       actor->next_index = page[0]->index & ~((1 << (msblk->block_log - PAGE_SHIFT)) - 1);
        actor->pageaddr = NULL;
+       actor->alloc_buffer = msblk->decompressor->alloc_buffer;
        actor->squashfs_first_page = direct_first_page;
        actor->squashfs_next_page = direct_next_page;
        actor->squashfs_finish_page = direct_finish_page;