[09/14] ubifs: separate errno from VM_FAULT_* values

Message ID 20180516054348.15950-10-hch@lst.de
State New
Delegated to: Richard Weinberger
Headers show
Series
  • [01/14] orangefs: don't return errno values from ->fault
Related show

Commit Message

Christoph Hellwig May 16, 2018, 5:43 a.m.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/ubifs/file.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Patch

diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index 1acb2ff505e6..7c1a2e1c3de5 100644
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -1513,7 +1513,7 @@  static int ubifs_releasepage(struct page *page, gfp_t unused_gfp_flags)
  * mmap()d file has taken write protection fault and is being made writable.
  * UBIFS must ensure page is budgeted for.
  */
-static int ubifs_vm_page_mkwrite(struct vm_fault *vmf)
+static vm_fault_t ubifs_vm_page_mkwrite(struct vm_fault *vmf)
 {
 	struct page *page = vmf->page;
 	struct inode *inode = file_inode(vmf->vma->vm_file);
@@ -1521,6 +1521,7 @@  static int ubifs_vm_page_mkwrite(struct vm_fault *vmf)
 	struct timespec now = current_time(inode);
 	struct ubifs_budget_req req = { .new_page = 1 };
 	int err, update_time;
+	vm_fault_t ret = 0;
 
 	dbg_gen("ino %lu, pg %lu, i_size %lld",	inode->i_ino, page->index,
 		i_size_read(inode));
@@ -1601,8 +1602,8 @@  static int ubifs_vm_page_mkwrite(struct vm_fault *vmf)
 	unlock_page(page);
 	ubifs_release_budget(c, &req);
 	if (err)
-		err = VM_FAULT_SIGBUS;
-	return err;
+		ret = VM_FAULT_SIGBUS;
+	return ret;
 }
 
 static const struct vm_operations_struct ubifs_file_vm_ops = {