[alternative-merged] cramfs-convert-to-use-vmf_insert_mixed.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: cramfs: convert to use vmf_insert_mixed
has been removed from the -mm tree.  Its filename was
     cramfs-convert-to-use-vmf_insert_mixed.patch

This patch was dropped because an alternative patch was merged

------------------------------------------------------
From: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Subject: cramfs: convert to use vmf_insert_mixed

Patch series "Push the vm_fault_t conversion further".

This patch series reaps some of the benefits of the vm_fault_t work that
Souptick has been diligently plugging away at by converting insert_pfn()
to return a vm_fault_t.

Eventually, we'll be able to do the same thing to insert_page(), but
there's more work to be done converting all current callers of
vm_insert_page() to vmf_insert_page(), and this patch series provides a
nice clean-up.


This patch (of 10):

cramfs is the only remaining user of vm_insert_mixed; convert it.

Link: http://lkml.kernel.org/r/20180828145728.11873-2-willy@xxxxxxxxxxxxx
Signed-off-by: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Cc: Nicolas Pitre <nicolas.pitre@xxxxxxxxxx>
Cc: Souptick Joarder <jrdr.linux@xxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 fs/cramfs/inode.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

--- a/fs/cramfs/inode.c~cramfs-convert-to-use-vmf_insert_mixed
+++ a/fs/cramfs/inode.c
@@ -417,10 +417,15 @@ static int cramfs_physmem_mmap(struct fi
 		 */
 		int i;
 		vma->vm_flags |= VM_MIXEDMAP;
-		for (i = 0; i < pages && !ret; i++) {
+		for (i = 0; i < pages; 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) {
+				pages = i;
+				break;
+			}
 		}
 	}
 
_

Patches currently in -mm which might be from willy@xxxxxxxxxxxxx are

mm-remove-vm_insert_mixed.patch
mm-introduce-vmf_insert_pfn_prot.patch
x86-convert-vdso-to-use-vm_fault_t.patch
mm-make-vm_insert_pfn_prot-static.patch
mm-remove-references-to-vm_insert_pfn.patch
mm-remove-vm_insert_pfn.patch
mm-inline-vm_insert_pfn_prot-into-caller.patch
mm-convert-__vm_insert_mixed-to-vm_fault_t.patch
mm-convert-insert_pfn-to-vm_fault_t.patch




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux