The patch titled
Subject: fs-convert-return-type-int-to-vm_fault_t-v2
has been added to the -mm tree. Its filename is
fs-convert-return-type-int-to-vm_fault_t-v2.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/fs-convert-return-type-int-to-vm_fault_t-v2.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/fs-convert-return-type-int-to-vm_fault_t-v2.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Souptick Joarder <jrdr.linux@xxxxxxxxx>
Subject: fs-convert-return-type-int-to-vm_fault_t-v2
v2: return type of nilfs_page_mkwrite() changed to vm_fault_t
Address Ryusuke's comment. remove err =0.
Link: http://lkml.kernel.org/r/20180830172547.GA4408@jordon-HP-15-Notebook-PC
Signed-off-by: Souptick Joarder <jrdr.linux@xxxxxxxxx>
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Theodore Ts'o <tytso@xxxxxxx>
Cc: Andreas Dilger <adilger.kernel@xxxxxxxxx>
Cc: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
Cc: Eric Biggers <ebiggers@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: Kemi Wang <kemi.wang@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
diff -puN fs/ext4/inode.c~fs-convert-return-type-int-to-vm_fault_t-v2 fs/ext4/inode.c
--- a/fs/ext4/inode.c~fs-convert-return-type-int-to-vm_fault_t-v2
+++ a/fs/ext4/inode.c
@@ -6174,14 +6174,13 @@ vm_fault_t ext4_page_mkwrite(struct vm_f
if (err)
goto out_ret;
- err = 0;
/* Delalloc case is easy... */
if (test_opt(inode->i_sb, DELALLOC) &&
!ext4_should_journal_data(inode) &&
!ext4_nonda_switch(inode->i_sb)) {
do {
ret = block_page_mkwrite(vma, vmf,
- ext4_da_get_block_prep, &err);
+ ext4_da_get_block_prep, &err);
} while (err == -ENOSPC &&
ext4_should_retry_alloc(inode->i_sb, &retries));
goto out;
@@ -6227,7 +6226,6 @@ retry_alloc:
ret = VM_FAULT_SIGBUS;
goto out;
}
- err = 0;
ret = block_page_mkwrite(vma, vmf, get_block, &err);
if (!ret && ext4_should_journal_data(inode)) {
if (ext4_walk_page_buffers(handle, page_buffers(page), 0,
@@ -6239,8 +6237,7 @@ retry_alloc:
ext4_set_inode_state(inode, EXT4_STATE_JDATA);
}
ext4_journal_stop(handle);
- if (err == -ENOSPC &&
- ext4_should_retry_alloc(inode->i_sb, &retries))
+ if (err == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
goto retry_alloc;
out_ret:
ret = block_page_mkwrite_return(err);
diff -puN fs/nilfs2/file.c~fs-convert-return-type-int-to-vm_fault_t-v2 fs/nilfs2/file.c
--- a/fs/nilfs2/file.c~fs-convert-return-type-int-to-vm_fault_t-v2
+++ a/fs/nilfs2/file.c
@@ -107,7 +107,6 @@ static vm_fault_t nilfs_page_mkwrite(str
goto out;
}
- err = 0;
file_update_time(vma->vm_file);
ret = block_page_mkwrite(vma, vmf, nilfs_get_block, &err);
if (ret) {
_
Patches currently in -mm which might be from jrdr.linux@xxxxxxxxx are
fs-iomap-change-return-type-to-vm_fault_t.patch
fs-convert-return-type-int-to-vm_fault_t.patch
fs-convert-return-type-int-to-vm_fault_t-v2.patch
mm-conveted-to-use-vm_fault_t.patch
