Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 220cca2a authored Mar 19, 2012 by Bob Peterson Committed by Steven Whitehouse Mar 20, 2012

GFS2: Change truncate page allocation to be GFP_NOFS



This patch changes the page allocation in gfs2_block_truncate_page
and two others to GFP_NOFS to avoid deadlock in low-memory conditions.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

parent 58a7d5fb

fs/gfs2/bmap.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -60,7 +60,7 @@ static int gfs2_unstuffer_page(struct gfs2_inode ip, struct buffer_head dibh,
	int release = 0;		int release = 0;

	if (!page \|\| page->index) {		if (!page \|\| page->index) {
	page = grab_cache_page(inode->i_mapping, 0);		page = find_or_create_page(inode->i_mapping, 0, GFP_NOFS);
	if (!page)		if (!page)
	return -ENOMEM;		return -ENOMEM;
	release = 1;		release = 1;
	@@ -930,7 +930,7 @@ static int gfs2_block_truncate_page(struct address_space *mapping, loff_t from)
	struct page *page;		struct page *page;
	int err;		int err;

	page = grab_cache_page(mapping, index);		page = find_or_create_page(mapping, index, GFP_NOFS);
	if (!page)		if (!page)
	return 0;		return 0;

fs/gfs2/quota.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -681,7 +681,7 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc,
	ptr = qp;		ptr = qp;
	nbytes = sizeof(struct gfs2_quota);		nbytes = sizeof(struct gfs2_quota);
	get_a_page:		get_a_page:
	page = grab_cache_page(mapping, index);		page = find_or_create_page(mapping, index, GFP_NOFS);
	if (!page)		if (!page)
	return -ENOMEM;		return -ENOMEM;