lkml.org 
[lkml]   [2020]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subjectlinux-next: build failure after merge of the akpm-current tree
    Hi all,

    After merging the akpm-current tree, today's linux-next build (powerpc
    ppc64_defconfig) failed like this:

    mm/readahead.c: In function 'page_cache_sync_ra':
    mm/readahead.c:565:8: error: 'filp' undeclared (first use in this function); did you mean 'file'?
    565 | if (!filp)
    | ^~~~
    | file

    Caused by commit

    f65bd470e7ed ("mm/readahead: add page_cache_sync_ra and page_cache_async_ra")

    interacting with commit

    09d008e3868e ("readahead: use limited read-ahead to satisfy read")

    from the block tree.

    I have added the following merge fix patch.

    From: Stephen Rothwell <sfr@canb.auug.org.au>
    Date: Fri, 16 Oct 2020 15:39:09 +1100
    Subject: [PATCH] mm/readahead: fix up for "readahead: use limited read-ahead to satisfy read"

    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    ---
    mm/readahead.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/mm/readahead.c b/mm/readahead.c
    index a673ec53de37..b4d162b38bd6 100644
    --- a/mm/readahead.c
    +++ b/mm/readahead.c
    @@ -562,7 +562,7 @@ void page_cache_sync_ra(struct readahead_control *ractl,
    * we're congested or tight on memory.
    */
    if (!ra->ra_pages || blk_cgroup_congested()) {
    - if (!filp)
    + if (!ractl->file)
    return;
    req_count = 1;
    do_forced_ra = true;
    --
    2.28.0
    --
    Cheers,
    Stephen Rothwell
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2020-10-16 06:46    [W:3.880 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site