summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-03-15 20:00:45 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2019-03-15 20:00:45 +0100
commitf91f2ee54a21404fbc633550e99d69d14c2478f2 (patch)
tree19620c0e3098d97567c119162a6111e4f7b7a5cc /include
parentMerge branch 'akpm' (patches from Andrew) (diff)
parentfilemap: add a comment about FAULT_FLAG_RETRY_NOWAIT behavior (diff)
downloadlinux-f91f2ee54a21404fbc633550e99d69d14c2478f2.tar.xz
linux-f91f2ee54a21404fbc633550e99d69d14c2478f2.zip
Merge branch 'akpm' (rest of patches from Andrew)
Merge the left-over patches from Andrew Morton. This merges the remaining two patches from Andrew's pile of "little bit more MM". I mulled it over, and we emailed back and forth with Josef, and he pointed out where I was wrong. Rule #51 of kernel maintenance: when somebody makes it clear that they know the code better than you did, stop arguing and just apply the damn patch. Add a third patch by me to add a comment for the case that I had thought was buggy and Josef corrected me on. * emailed patches from Andrew Morton <akpm@linux-foundation.org>: filemap: add a comment about FAULT_FLAG_RETRY_NOWAIT behavior filemap: drop the mmap_sem for all blocking operations filemap: kill page_cache_read usage in filemap_fault
Diffstat (limited to 'include')
-rw-r--r--include/linux/pagemap.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index b477a70cc2e4..bcf909d0de5f 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -239,6 +239,7 @@ pgoff_t page_cache_prev_miss(struct address_space *mapping,
#define FGP_WRITE 0x00000008
#define FGP_NOFS 0x00000010
#define FGP_NOWAIT 0x00000020
+#define FGP_FOR_MMAP 0x00000040
struct page *pagecache_get_page(struct address_space *mapping, pgoff_t offset,
int fgp_flags, gfp_t cache_gfp_mask);