Skip to contentSkip to conversation

fs/ceph/addr.c: Convert to use vmf_error()

PATCH Applied Souptick Joarder 2 participants 2 messages Jan 4, 2019 – Jan 5, 2019 Ceph client

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fs/ceph/addr.c: Convert to use vmf_error()

This code is converted to use vmf_error().

---
 fs/ceph/addr.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
fs/ceph/addr.c +1 -4
index 8eade7a..fa2a85d 100644
@@ -1495,10 +1495,7 @@ static vm_fault_t ceph_filemap_fault(struct vm_fault *vmf)
 		if (err < 0 || off >= i_size_read(inode)) {
 			unlock_page(page);
 			put_page(page);
-			if (err == -ENOMEM)
-				ret = VM_FAULT_OOM;
-			else
-				ret = VM_FAULT_SIGBUS;
+			ret = vmf_error(err);
 			goto out_inline;
 		}
 		if (err < PAGE_SIZE)
Signature · 1 line
1.9.1
maintainer Applied
#1 lore raw
Quoted 14 lines · Souptick Joarder

This code is converted to use vmf_error().

---
 fs/ceph/addr.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
fs/ceph/addr.c +0 -0
index 8eade7a..fa2a85d 100644
@@ -1495,10 +1495,7 @@ static vm_fault_t ceph_filemap_fault(struct vm_fault *vmf)
                if (err < 0 || off >= i_size_read(inode)) {

fs/ceph/addr.c static vm_fault_t ceph_filemap_fault(struct vm_fault *vmf) · line 1501

Quoted 10 lines
fs/ceph/addr.c +1 -4
                        unlock_page(page);
                        put_page(page);
-                       if (err == -ENOMEM)
-                               ret = VM_FAULT_OOM;
-                       else
-                               ret = VM_FAULT_SIGBUS;
+                       ret = vmf_error(err);
                        goto out_inline;
                }
                if (err < PAGE_SIZE)

Applied.

Thanks,

Ilya