diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2018-10-26 15:04:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-26 16:25:19 -0700 |
| commit | 7f2764cfbd85a18170f9d7a4cf01454dead8b0bc (patch) | |
| tree | 1e941d44e8291a420317f390590983a3fcb8f36a /fs | |
| parent | 4b96a37d1c684f12468f436c0d79b5e6830d0b0b (diff) | |
| download | linux-stable-7f2764cfbd85a18170f9d7a4cf01454dead8b0bc.tar.gz linux-stable-7f2764cfbd85a18170f9d7a4cf01454dead8b0bc.tar.bz2 linux-stable-7f2764cfbd85a18170f9d7a4cf01454dead8b0bc.zip | |
cramfs: convert to use vmf_insert_mixed
cramfs is the only remaining user of vm_insert_mixed() and should be
converted to vmf_insert_mixed().
Based on a previous patch from Matthew Wilcox.
Link: http://lkml.kernel.org/r/nycvar.YSQ.7.76.1808290945450.10215@knanqh.ubzr
Signed-off-by: Nicolas Pitre <nico@linaro.org>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Souptick Joarder <jrdr.linux@gmail.com>a
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cramfs/inode.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c index f408994fc632..0c35e62f108d 100644 --- a/fs/cramfs/inode.c +++ b/fs/cramfs/inode.c @@ -418,9 +418,12 @@ static int cramfs_physmem_mmap(struct file *file, struct vm_area_struct *vma) int i; vma->vm_flags |= VM_MIXEDMAP; for (i = 0; i < pages && !ret; i++) { + vm_fault_t vmf; unsigned long off = i * PAGE_SIZE; pfn_t pfn = phys_to_pfn_t(address + off, PFN_DEV); - ret = vm_insert_mixed(vma, vma->vm_start + off, pfn); + vmf = vmf_insert_mixed(vma, vma->vm_start + off, pfn); + if (vmf & VM_FAULT_ERROR) + ret = vm_fault_to_errno(vmf, 0); } } |