lkml.org 
[lkml]   [2020]   [May]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: build failure after merge of the block tree
Hi all,

On Mon, 25 May 2020 13:03:44 -0600 Jens Axboe <axboe@kernel.dk> wrote:
>
> On 5/24/20 11:08 PM, Stephen Rothwell wrote:
> >
> > After merging the block tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > mm/filemap.c: In function 'generic_file_buffered_read':
> > mm/filemap.c:2075:9: error: 'written' undeclared (first use in this function); did you mean 'writeb'?
> > 2075 | if (written) {
> > | ^~~~~~~
> > | writeb
> >
> > Caused by commit
> >
> > 23d513106fd8 ("mm: support async buffered reads in generic_file_buffered_read()")
> >
> > from the block tree interacting with commit
> >
> > 6e66f10f2cac ("fs: export generic_file_buffered_read()")
> >
> > from the btrfs tree.
> >
> > [Aside: that btrfs tree commit talks about "correct the comments and variable
> > names", but changes "written" to "copied" in the function definition
> > but to "already_read" in the header file declaration ...]
> >
> > I ave applied the following merge fix patch:
>
> Looks like a frivolous change... Thanks for fixing this up Stephen.

The variable name change has been removed from the btrfs tree.

--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2020-05-26 06:37    [W:0.056 / U:0.444 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site