mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	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>
This commit is contained in:
		
							parent
							
								
									58a7d5fb8e
								
							
						
					
					
						commit
						220cca2a4f
					
				
					 2 changed files with 3 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -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;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue