On Tue, Jun 26, 2018 at 9:52 AM, Souptick Joarder <jrdr.linux@xxxxxxxxx> wrote:
> On Sun, Jun 17, 2018 at 11:48 AM, Souptick Joarder <jrdr.linux@xxxxxxxxx> wrote:
>> On Wed, May 16, 2018 at 4:16 PM, Miklos Szeredi <miklos@xxxxxxxxxx> wrote:
>>> On Wed, May 16, 2018 at 6:45 AM, Souptick Joarder <jrdr.linux@xxxxxxxxx> wrote:
>>>> On Sat, May 12, 2018 at 10:25 AM, Souptick Joarder <jrdr.linux@xxxxxxxxx> wrote:
>>>>> Use new return type vm_fault_t for fault handler
>>>>> in struct vm_operations_struct. For now, this is
>>>>> just documenting that the function returns a
>>>>> VM_FAULT value rather than an errno. Once all
>>>>> instances are converted, vm_fault_t will become
>>>>> a distinct type.
>>>>>
>>>>> commit 1c8f422059ae ("mm: change return type to
>>>>> vm_fault_t")
>>>>>
>>>>> Signed-off-by: Souptick Joarder <jrdr.linux@xxxxxxxxx>
>>>>> Reviewed-by: Matthew Wilcox <mawilcox@xxxxxxxxxxxxx>
>>>>> ---
>>>>> fs/fuse/file.c | 2 +-
>>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/fs/fuse/file.c b/fs/fuse/file.c
>>>>> index a201fb0..67648cc 100644
>>>>> --- a/fs/fuse/file.c
>>>>> +++ b/fs/fuse/file.c
>>>>> @@ -2048,7 +2048,7 @@ static void fuse_vma_close(struct vm_area_struct *vma)
>>>>> * - sync(2)
>>>>> * - try_to_free_pages() with order > PAGE_ALLOC_COSTLY_ORDER
>>>>> */
>>>>> -static int fuse_page_mkwrite(struct vm_fault *vmf)
>>>>> +static vm_fault_t fuse_page_mkwrite(struct vm_fault *vmf)
>>>>> {
>>>>> struct page *page = vmf->page;
>>>>> struct inode *inode = file_inode(vmf->vma->vm_file);
>>>>> --
>>>>> 1.9.1
>>>>>
>>>>
>>>> Miklos, we would like to get this patch in queue
>>>> for 4.18.
>>>
>>> Sure, queued up.
>>>
>>
>> This patch is not merged in 4.18-rc-1
>
> Miklos, Can we get this patch in 4.18-rc-x / 4.19 ?
Sure, queued up for 4.18-rc
(git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next).
Sorry for the delay, somehow I left this off the 4.18 pull.
Thanks,
Miklos
