Re: linux-next: build failure after merge of the block tree

Jens Axboe
2020-05-26T13:53:38Z

On 5/25/20 10:36 PM, Stephen Rothwell wrote:
> 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.

Thanks - I'd encourage that name changing late in the merge window
instead. The change is obviously fine, but a) it should not be done in
an unrelated change, and b) it can be done without risking causing silly
merge issues.

--
Jens Axboe