From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-io0-f196.google.com ([209.85.223.196]:43415 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753183AbeGCVwF (ORCPT ); Tue, 3 Jul 2018 17:52:05 -0400 Received: by mail-io0-f196.google.com with SMTP id i23-v6so3067609iog.10 for ; Tue, 03 Jul 2018 14:52:05 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <20180703213943.GU32415@magnolia> References: <20180702154354.GA3919@jordon-HP-15-Notebook-PC> <20180703213943.GU32415@magnolia> From: Andreas Gruenbacher Date: Tue, 3 Jul 2018 23:52:04 +0200 Message-ID: Subject: Re: [PATCH] fs: iomap: Change return type to vm_fault_t To: "Darrick J. Wong" Cc: Souptick Joarder , Andrew Morton , Alexander Viro , Jan Kara , Dave Chinner , "Theodore Ts'o" , Bob Peterson , Greg Kroah-Hartman , linux-fsdevel , LKML , willy@infradead.org, Christoph Hellwig Content-Type: text/plain; charset="UTF-8" Sender: linux-fsdevel-owner@vger.kernel.org List-ID: On 3 July 2018 at 23:39, Darrick J. Wong wrote: > On Mon, Jul 02, 2018 at 07:52:41PM +0200, Andreas Gruenbacher wrote: >> On 2 July 2018 at 17:43, Souptick Joarder wrote: >> > Return type has been changed to vm_fault_t type for >> > iomap_page_mkwrite(). >> > >> > see commit 1c8f422059ae ("mm: change return type to >> > vm_fault_t") for reference. >> > >> > Signed-off-by: Souptick Joarder >> > Reviewed-by: Matthew Wilcox > > I don't recall Christoph [now cc'd] rescinding his NAK of the previous > version of this patch[1]. Has he changed his mind since May? Oops, a reply gone wrong -- I was meaning to reply to Souptick Joarder's gfs2 change which I've added to the gfs2 for-next branch. Not the iomap change. Sorry for the confusion. > [1] https://spinics.net/lists/linux-fsdevel/msg126032.html > > Now granted I didn't have a problem with the code (and applied the xfs > version to 4.18 after monitoring to satisfy myself that nothing > particularly weird happened during 4.17) but seeing as most of the iomap > changes have gone through hch's review and landed via the xfs tree... > >> > --- >> > fs/iomap.c | 2 +- >> > include/linux/iomap.h | 4 +++- >> > 2 files changed, 4 insertions(+), 2 deletions(-) >> > >> > diff --git a/fs/iomap.c b/fs/iomap.c >> > index afd1635..58477ee 100644 >> > --- a/fs/iomap.c >> > +++ b/fs/iomap.c >> > @@ -443,7 +443,7 @@ static int iomap_dax_zero(loff_t pos, unsigned offset, unsigned bytes, >> > return length; >> > } >> > >> > -int iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops) >> > +vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops) >> > { >> > struct page *page = vmf->page; >> > struct inode *inode = file_inode(vmf->vma->vm_file); >> > diff --git a/include/linux/iomap.h b/include/linux/iomap.h >> > index 19a07de..666b717 100644 >> > --- a/include/linux/iomap.h >> > +++ b/include/linux/iomap.h >> > @@ -3,6 +3,7 @@ >> > #define LINUX_IOMAP_H 1 >> > >> > #include >> > +#include >> > >> > struct fiemap_extent_info; >> > struct inode; >> > @@ -88,7 +89,8 @@ int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len, >> > bool *did_zero, const struct iomap_ops *ops); >> > int iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero, >> > const struct iomap_ops *ops); >> > -int iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops); >> > +vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, >> > + const struct iomap_ops *ops); >> > int iomap_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, >> > loff_t start, loff_t len, const struct iomap_ops *ops); >> > loff_t iomap_seek_hole(struct inode *inode, loff_t offset, >> > -- >> > 1.9.1 >> > >> >> Added to for-next, thanks. > > ...this part caused me to sit up and say "Hey what?" :) > > Which tree is this? gfs2? > > --D > >> >> Andreas