Skip to content

Commit

Permalink
Adjust to recent user page API changes
Browse files Browse the repository at this point in the history
4.6.0 basically renamed get_user_pages() to get_user_pages_remote() and
introduced a new get_user_pages() that always works on the current
task.[1] Distinguish the two APIs based on kernel version we're
compiling for.

Also, there seems to have been a massive cleansing of
page_cache_release(page) in favour of put_page(page)[2] which was an
alias for put_page(page)[3] since 2.6.0. Before that beginning with
2.4.0 both page_cache_release(page) and put_page(page) have been aliases
for __free_page(page). So using put_page() instead of
page_cache_release(page) will produce identical code for anything after
2.4.0.

[1] https://lkml.org/lkml/2016/2/10/555
[2] https://www.spinics.net/lists/linux-fsdevel/msg95923.html
[3] https://www.spinics.net/lists/linux-fsdevel/msg95922.html
  • Loading branch information
michaelweiser committed Aug 19, 2016
1 parent 7a3a9ee commit f14b470
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions zc.c
Expand Up @@ -59,7 +59,12 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write,
}

down_read(&mm->mmap_sem);
ret = get_user_pages(task, mm,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0))
ret = get_user_pages_remote(
#else
ret = get_user_pages(
#endif
task, mm,
(unsigned long)addr, pgcount, write, 0, pg, NULL);
up_read(&mm->mmap_sem);
if (ret != pgcount)
Expand Down Expand Up @@ -119,7 +124,7 @@ void release_user_pages(struct csession *ses)
else
ses->readonly_pages--;

page_cache_release(ses->pages[i]);
put_page(ses->pages[i]);
}
ses->used_pages = 0;
}
Expand Down

0 comments on commit f14b470

Please sign in to comment.