diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-15 12:00:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-15 12:00:45 -0700 |
| commit | f91f2ee54a21404fbc633550e99d69d14c2478f2 (patch) | |
| tree | 19620c0e3098d97567c119162a6111e4f7b7a5cc /include | |
| parent | f261c4e529dac5608a604d3dd3ae1cd2adf23c89 (diff) | |
| parent | 8b0f9fa2e02dc95216577c3387b0707c5f60fbaf (diff) | |
| download | linux-0-day-f91f2ee54a21404fbc633550e99d69d14c2478f2.tar.gz linux-0-day-f91f2ee54a21404fbc633550e99d69d14c2478f2.tar.xz | |
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.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index b477a70cc2e45..bcf909d0de5f8 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); |