packages/kernel/antfs/patches/0001-file.c-Patch-for-Linux-v5.8.patch
Ilya Lipnitskiy 5d8d4fbbcb
treewide: Run refresh on all packages
The crude loop I wrote to come up with this changeset:

  find -L package/feeds/packages/ -name patches | \
  sed 's/patches$/refresh/' | sort | xargs make

Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
2021-02-20 16:02:15 -08:00

40 lines
1.1 KiB
Diff

--- a/file.c
+++ b/file.c
@@ -625,6 +625,9 @@ static int antfs_readpages(struct file *
unsigned page_idx = nr_pages;
pgoff_t page_idx_to_init;
bool do_init_page = false;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
+ DEFINE_READAHEAD(rac, file, mapping, 0);
+#endif
if (page_offs & (buffer_len - 1)) {
/* If initialized size is not on buffer boundary, walk
@@ -660,8 +663,13 @@ static int antfs_readpages(struct file *
}
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
+ mpage_readahead(&rac, antfs_get_block);
+ err = 0;
+#else
err = mpage_readpages(mapping, pages, nr_pages,
antfs_get_block);
+#endif
if (!err && do_init_page) {
/* Initialize stuff past initialized_size with zero. */
page = grab_cache_page(mapping, page_idx_to_init);
--- a/libntfs-3g/misc.c
+++ b/libntfs-3g/misc.c
@@ -38,7 +38,11 @@ void *ntfs_malloc(size_t size)
return kmalloc(size, GFP_KERNEL);
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)
+ return __vmalloc(size, GFP_KERNEL);
+#else
return __vmalloc(size, GFP_KERNEL, PAGE_KERNEL);
+#endif
}
/**