lkml.org 
[lkml]   [2012]   [Jan]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[4/7] vfs: __read_cache_page should use gfp argument rather than GFP_KERNEL
    2.6.32-longterm review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dave Kleikamp <dave.kleikamp@oracle.com>

    commit e6f67b8c05f5e129e126f4409ddac6f25f58ffcb upstream.

    lockdep reports a deadlock in jfs because a special inode's rw semaphore
    is taken recursively. The mapping's gfp mask is GFP_NOFS, but is not
    used when __read_cache_page() calls add_to_page_cache_lru().

    Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
    Acked-by: Hugh Dickins <hughd@google.com>
    Acked-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    mm/filemap.c | 7 ++-----
    1 file changed, 2 insertions(+), 5 deletions(-)

    --- a/mm/filemap.c
    +++ b/mm/filemap.c
    @@ -1675,7 +1675,7 @@ repeat:
    page = __page_cache_alloc(gfp | __GFP_COLD);
    if (!page)
    return ERR_PTR(-ENOMEM);
    - err = add_to_page_cache_lru(page, mapping, index, GFP_KERNEL);
    + err = add_to_page_cache_lru(page, mapping, index, gfp);
    if (unlikely(err)) {
    page_cache_release(page);
    if (err == -EEXIST)
    @@ -1772,10 +1772,7 @@ static struct page *wait_on_page_read(st
    * @gfp: the page allocator flags to use if allocating
    *
    * This is the same as "read_mapping_page(mapping, index, NULL)", but with
    - * any new page allocations done using the specified allocation flags. Note
    - * that the Radix tree operations will still use GFP_KERNEL, so you can't
    - * expect to do this atomically or anything like that - but you can pass in
    - * other page requirements.
    + * any new page allocations done using the specified allocation flags.
    *
    * If the page does not get brought uptodate, return -EIO.
    */



    \
     
     \ /
      Last update: 2012-01-03 23:07    [W:0.025 / U:0.612 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site