From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f193.google.com ([209.85.208.193]:37109 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752169AbeFZHwl (ORCPT ); Tue, 26 Jun 2018 03:52:41 -0400 Received: by mail-lj1-f193.google.com with SMTP id r20-v6so669394ljg.4 for ; Tue, 26 Jun 2018 00:52:40 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: References: <20180512045537.GA3966@jordon-HP-15-Notebook-PC> From: Souptick Joarder Date: Tue, 26 Jun 2018 13:22:39 +0530 Message-ID: Subject: Re: [PATCH v2] fs: fuse: Adding new return type vm_fault_t To: Miklos Szeredi Cc: linux-fsdevel , Matthew Wilcox Content-Type: text/plain; charset="UTF-8" Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On Sun, Jun 17, 2018 at 11:48 AM, Souptick Joarder wrote: > On Wed, May 16, 2018 at 4:16 PM, Miklos Szeredi wrote: >> On Wed, May 16, 2018 at 6:45 AM, Souptick Joarder wrote: >>> On Sat, May 12, 2018 at 10:25 AM, Souptick Joarder 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 >>>> Reviewed-by: Matthew Wilcox >>>> --- >>>> 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 ?