Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 1 Mar 2021 12:04:27 +0100
From:   David Sterba <dsterba@suse.cz>
To:     Christoph Hellwig <hch@lst.de>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Andrew Morton <akpm@linux-foundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Martin Raiber <martin@urbackup.org>,
        "Matthew Wilcox (Oracle)" <willy@infradead.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the btrfs
 tree
Message-ID: <20210301110427.GT7604@suse.cz>
Reply-To: dsterba@suse.cz
Mail-Followup-To: dsterba@suse.cz, Christoph Hellwig <hch@lst.de>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Andrew Morton <akpm@linux-foundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Martin Raiber <martin@urbackup.org>,
        "Matthew Wilcox (Oracle)" <willy@infradead.org>
References: <20210127223918.1b3e4b3f@canb.auug.org.au>
 <20210215084634.06c1b430@canb.auug.org.au>
 <20210226103250.7b08a233@canb.auug.org.au>
 <20210226051626.GA2072@lst.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20210226051626.GA2072@lst.de>
User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12)
Precedence: bulk

On Fri, Feb 26, 2021 at 06:16:26AM +0100, Christoph Hellwig wrote:
> On Fri, Feb 26, 2021 at 10:32:50AM +1100, Stephen Rothwell wrote:
> > > >  -	return filemap_read(iocb, to, ret);
> > > >  +	if (iocb->ki_flags & IOCB_NOWAIT)
> > > >  +		iocb->ki_flags |= IOCB_NOIO;
> > > >  +
> > > > - 	ret = generic_file_buffered_read(iocb, to, ret);
> > > > ++	ret = filemap_read(iocb, to, ret);
> > > >  +
> > > >  +	if (iocb->ki_flags & IOCB_NOWAIT) {
> > > >  +		iocb->ki_flags &= ~IOCB_NOIO;
> > > >  +		if (ret == 0)
> > > >  +			ret = -EAGAIN;
> > > >  +	}
> > > >  +
> > > >  +	return ret;
> > > >   }
> 
> I think the above code looks completely bogus.  Instead whatever code
> in btrfs hecks for IOCB_NOIO to avoid blocking readahead should also
> check IOCB_NOWAIT.

Thanks for the comment, I've removed the patch from for-next and
notified the authors.