On 5/24/20 11:08 PM, Stephen Rothwell wrote: > Hi all, > > 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. -- Jens Axboe