Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 10 May 2022 16:04:52 +0100
From:   Matthew Wilcox <willy@infradead.org>
To:     Filipe Manana <fdmanana@suse.com>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        David Sterba <dsterba@suse.cz>,
        David Sterba <dsterba@suse.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the folio tree with the btrfs tree
Message-ID: <Ynp/FDvASFnsVf13@casper.infradead.org>
References: <20220510183908.7571cb73@canb.auug.org.au>
 <55f4b515-1d1c-fd3e-0f93-4cda45261c91@suse.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <55f4b515-1d1c-fd3e-0f93-4cda45261c91@suse.com>
Precedence: bulk

On Tue, May 10, 2022 at 10:43:07AM +0100, Filipe Manana wrote:
> On 10/05/22 09:39, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the folio tree got a conflict in:
> > 
> >   fs/btrfs/send.c
> > 
> > between commit:
> > 
> >   d1a1a97304b4 ("btrfs: send: keep the current inode open while processing it")
> > 
> > from the btrfs tree and commit:
> > 
> >   2ebdd1df3166 ("mm/readahead: Convert page_cache_async_readahead to take a folio")
> > 
> > from the folio tree.
> > 
> > I fixed it up (I think - see below) and can carry the fix as
> 
> Looks correct to me.

Me too.  The patch this one enables is rather sad.  It's yet another
reminder that we suck at streaming workloads.  But until we fix that,
don't you want to use invalidate_inode_pages2_range() rather than
truncate_inode_pages_range()?  If your send conflicts with someone
else's write(), you'll erase their write to the page cache.