[folded-merged] dax-check-return-value-of-dax_radix_entry-v2.patch removed from -mm tree

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

 



The patch titled
     Subject: dax-check-return-value-of-dax_radix_entry-v2
has been removed from the -mm tree.  Its filename was
     dax-check-return-value-of-dax_radix_entry-v2.patch

This patch was dropped because it was folded into dax-check-return-value-of-dax_radix_entry.patch

------------------------------------------------------
From: Ross Zwisler <ross.zwisler@xxxxxxxxxxxxxxx>
Subject: dax-check-return-value-of-dax_radix_entry-v2

Signed-off-by: Ross Zwisler <ross.zwisler@xxxxxxxxxxxxxxx>
Cc: Dan Williams <dan.j.williams@xxxxxxxxx>
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxxxx>
Cc: Dave Chinner <david@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 fs/dax.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff -puN fs/dax.c~dax-check-return-value-of-dax_radix_entry-v2 fs/dax.c
--- a/fs/dax.c~dax-check-return-value-of-dax_radix_entry-v2
+++ a/fs/dax.c
@@ -1068,9 +1068,11 @@ int dax_pfn_mkwrite(struct vm_area_struc
 	 */
 	error = dax_radix_entry(file->f_mapping, vmf->pgoff, NO_SECTOR, false,
 			true);
-	if (error)
-		return error;
 
+	if (error == -ENOMEM)
+		return VM_FAULT_OOM;
+	if (error)
+		return VM_FAULT_SIGBUS;
 	return VM_FAULT_NOPAGE;
 }
 EXPORT_SYMBOL_GPL(dax_pfn_mkwrite);
_

Patches currently in -mm which might be from ross.zwisler@xxxxxxxxxxxxxxx are

dax-check-return-value-of-dax_radix_entry.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



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

  Powered by Linux