From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Whitehouse Date: Tue, 20 Mar 2012 11:37:05 +0000 Subject: [Cluster-devel] [GFS2 PATCH] GFS2: Change truncate page allocation to be GFP_NOFS In-Reply-To: References: Message-ID: <1332243425.2764.36.camel@menhir> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Hi, Now in the -nmw tree, just making the merge window this time, Steve. On Mon, 2012-03-19 at 15:25 -0400, Bob Peterson wrote: > Hi, > > This patch changes the page allocation in gfs2_block_truncate_page > and two others to GFP_NOFS to avoid deadlock in low-memory conditions. > > Regards, > > Bob Peterson > Red Hat File Systems > > Signed-off-by: Bob Peterson > -- > diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c > index 14a7040..197c5c4 100644 > --- a/fs/gfs2/bmap.c > +++ b/fs/gfs2/bmap.c > @@ -60,7 +60,7 @@ static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh, > int release = 0; > > 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) > return -ENOMEM; > release = 1; > @@ -930,7 +930,7 @@ static int gfs2_block_truncate_page(struct address_space *mapping, loff_t from) > struct page *page; > int err; > > - page = grab_cache_page(mapping, index); > + page = find_or_create_page(mapping, index, GFP_NOFS); > if (!page) > return 0; > > diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c > index a45b21b..4856c66 100644 > --- a/fs/gfs2/quota.c > +++ b/fs/gfs2/quota.c > @@ -681,7 +681,7 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc, > ptr = qp; > nbytes = sizeof(struct gfs2_quota); > get_a_page: > - page = grab_cache_page(mapping, index); > + page = find_or_create_page(mapping, index, GFP_NOFS); > if (!page) > return -ENOMEM; > >