diff options
| author | Dave Kleikamp <dave.kleikamp@oracle.com> | 2011-12-21 11:05:48 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-06 15:38:01 -0800 |
| commit | f1ab682d4e723d87408f384e79496ba61c1686c1 (patch) | |
| tree | 95f428ca1c0147d365437d3397a71f7f614bbaa9 /mm | |
| parent | adfbc6daa5d77b68aaeb01039b74ffc857c07d8f (diff) | |
vfs: __read_cache_page should use gfp argument rather than GFP_KERNEL
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>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/filemap.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 9e0826ea7bbe..a1fe37818bd6 100644 --- 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(struct page *page) * @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. */ |