Commit ae0f1625 authored by David Sterba's avatar David Sterba
Browse files

btrfs: sink gfp parameter to clear_extent_bit 



All callers use GFP_NOFS, we don't have to pass it as an argument. The
built-in tests pass GFP_KERNEL, but they run only at module load time
and NOFS works there as well.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 66b0c887

fs/btrfs/extent_io.c

+5 −5
Original line number Diff line number Diff line
@@ -1295,10 +1295,10 @@ int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, 


int clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,

		     unsigned bits, int wake, int delete,

		     struct extent_state **cached, gfp_t mask)

		     struct extent_state **cached)

{

	return __clear_extent_bit(tree, start, end, bits, wake, delete,

				  cached, mask, NULL);

				  cached, GFP_NOFS, NULL);

}



int clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
@@ -1348,7 +1348,7 @@ int try_lock_extent(struct extent_io_tree *tree, u64 start, u64 end) 
	if (err == -EEXIST) {

		if (failed_start > start)

			clear_extent_bit(tree, start, failed_start - 1,

					 EXTENT_LOCKED, 1, 0, NULL, GFP_NOFS);

					 EXTENT_LOCKED, 1, 0, NULL);

		return 0;

	}

	return 1;
@@ -1744,7 +1744,7 @@ void extent_clear_unlock_delalloc(struct inode *inode, u64 start, u64 end, 
				 unsigned long page_ops)

{

	clear_extent_bit(&BTRFS_I(inode)->io_tree, start, end, clear_bits, 1, 0,

			 NULL, GFP_NOFS);

			 NULL);



	__process_pages_contig(inode->i_mapping, locked_page,

			       start >> PAGE_SHIFT, end >> PAGE_SHIFT,
@@ -4207,7 +4207,7 @@ int extent_invalidatepage(struct extent_io_tree *tree, 
	clear_extent_bit(tree, start, end,

			 EXTENT_LOCKED | EXTENT_DIRTY | EXTENT_DELALLOC |

			 EXTENT_DO_ACCOUNTING,

			 1, 1, &cached_state, GFP_NOFS);

			 1, 1, &cached_state);

	return 0;

}

fs/btrfs/extent_io.h

+4 −6
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ int clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, 
		unsigned bits, struct extent_changeset *changeset);

int clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,

		     unsigned bits, int wake, int delete,

		     struct extent_state **cached, gfp_t mask);

		     struct extent_state **cached);

int __clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,

		     unsigned bits, int wake, int delete,

		     struct extent_state **cached, gfp_t mask,
@@ -308,8 +308,7 @@ int __clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, 


static inline int unlock_extent(struct extent_io_tree *tree, u64 start, u64 end)

{

	return clear_extent_bit(tree, start, end, EXTENT_LOCKED, 1, 0, NULL,

				GFP_NOFS);

	return clear_extent_bit(tree, start, end, EXTENT_LOCKED, 1, 0, NULL);

}



static inline int unlock_extent_cached(struct extent_io_tree *tree, u64 start,
@@ -327,8 +326,7 @@ static inline int clear_extent_bits(struct extent_io_tree *tree, u64 start, 
	if (bits & EXTENT_LOCKED)

		wake = 1;



	return clear_extent_bit(tree, start, end, bits, wake, 0, NULL,

			GFP_NOFS);

	return clear_extent_bit(tree, start, end, bits, wake, 0, NULL);

}



int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
@@ -362,7 +360,7 @@ static inline int clear_extent_dirty(struct extent_io_tree *tree, u64 start, 
{

	return clear_extent_bit(tree, start, end,

				EXTENT_DIRTY | EXTENT_DELALLOC |

				EXTENT_DO_ACCOUNTING, 0, 0, NULL, GFP_NOFS);

				EXTENT_DO_ACCOUNTING, 0, 0, NULL);

}



int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,

fs/btrfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1519,7 +1519,7 @@ lock_and_cleanup_extent_if_need(struct btrfs_inode *inode, struct page **pages, 
		clear_extent_bit(&inode->io_tree, start_pos, last_pos,

				 EXTENT_DIRTY | EXTENT_DELALLOC |

				 EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,

				 0, 0, cached_state, GFP_NOFS);

				 0, 0, cached_state);

		*lockstart = start_pos;

		*lockend = last_pos;

		ret = 1;

fs/btrfs/free-space-cache.c

+3 −5
Original line number Diff line number Diff line
@@ -993,8 +993,7 @@ update_cache_item(struct btrfs_trans_handle *trans, 
	ret = btrfs_search_slot(trans, root, &key, path, 0, 1);

	if (ret < 0) {

		clear_extent_bit(&BTRFS_I(inode)->io_tree, 0, inode->i_size - 1,

				 EXTENT_DIRTY | EXTENT_DELALLOC, 0, 0, NULL,

				 GFP_NOFS);

				 EXTENT_DIRTY | EXTENT_DELALLOC, 0, 0, NULL);

		goto fail;

	}

	leaf = path->nodes[0];
@@ -1008,7 +1007,7 @@ update_cache_item(struct btrfs_trans_handle *trans, 
			clear_extent_bit(&BTRFS_I(inode)->io_tree, 0,

					 inode->i_size - 1,

					 EXTENT_DIRTY | EXTENT_DELALLOC, 0, 0,

					 NULL, GFP_NOFS);

					 NULL);

			btrfs_release_path(path);

			goto fail;

		}
@@ -1105,8 +1104,7 @@ static int flush_dirty_cache(struct inode *inode) 
	ret = btrfs_wait_ordered_range(inode, 0, (u64)-1);

	if (ret)

		clear_extent_bit(&BTRFS_I(inode)->io_tree, 0, inode->i_size - 1,

				 EXTENT_DIRTY | EXTENT_DELALLOC, 0, 0, NULL,

				 GFP_NOFS);

				 EXTENT_DIRTY | EXTENT_DELALLOC, 0, 0, NULL);



	return ret;

}

fs/btrfs/inode.c

+10 −12
Original line number Diff line number Diff line
@@ -1203,7 +1203,7 @@ static int cow_file_range_async(struct inode *inode, struct page *locked_page, 
	u64 cur_end;



	clear_extent_bit(&BTRFS_I(inode)->io_tree, start, end, EXTENT_LOCKED,

			 1, 0, NULL, GFP_NOFS);

			 1, 0, NULL);

	while (start < end) {

		async_cow = kmalloc(sizeof(*async_cow), GFP_NOFS);

		BUG_ON(!async_cow); /* -ENOMEM */
@@ -3000,7 +3000,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) 


		clear_extent_bit(io_tree, ordered_extent->file_offset,

			ordered_extent->file_offset + ordered_extent->len - 1,

			EXTENT_DEFRAG, 0, 0, &cached_state, GFP_NOFS);

			EXTENT_DEFRAG, 0, 0, &cached_state);

	}



	if (nolock)
@@ -3070,7 +3070,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) 
				 ordered_extent->len - 1,

				 clear_bits,

				 (clear_bits & EXTENT_LOCKED) ? 1 : 0,

				 0, &cached_state, GFP_NOFS);

				 0, &cached_state);

	}



	if (trans)
@@ -4812,7 +4812,7 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, 
	clear_extent_bit(&BTRFS_I(inode)->io_tree, block_start, block_end,

			  EXTENT_DIRTY | EXTENT_DELALLOC |

			  EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,

			  0, 0, &cached_state, GFP_NOFS);

			  0, 0, &cached_state);



	ret = btrfs_set_extent_delalloc(inode, block_start, block_end, 0,

					&cached_state, 0);
@@ -5248,8 +5248,7 @@ static void evict_inode_truncate_pages(struct inode *inode) 
		clear_extent_bit(io_tree, start, end,

				 EXTENT_LOCKED | EXTENT_DIRTY |

				 EXTENT_DELALLOC | EXTENT_DO_ACCOUNTING |

				 EXTENT_DEFRAG, 1, 1,

				 &cached_state, GFP_NOFS);

				 EXTENT_DEFRAG, 1, 1, &cached_state);



		cond_resched();

		spin_lock(&io_tree->lock);
@@ -7936,7 +7935,7 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock, 
	if (lockstart < lockend) {

		clear_extent_bit(&BTRFS_I(inode)->io_tree, lockstart,

				 lockend, unlock_bits, 1, 0,

				 &cached_state, GFP_NOFS);

				 &cached_state);

	} else {

		free_extent_state(cached_state);

	}
@@ -7947,7 +7946,7 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock, 


unlock_err:

	clear_extent_bit(&BTRFS_I(inode)->io_tree, lockstart, lockend,

			 unlock_bits, 1, 0, &cached_state, GFP_NOFS);

			 unlock_bits, 1, 0, &cached_state);

err:

	if (dio_data)

		current->journal_info = dio_data;
@@ -8989,8 +8988,7 @@ static void btrfs_invalidatepage(struct page *page, unsigned int offset, 
					 EXTENT_DIRTY | EXTENT_DELALLOC |

					 EXTENT_DELALLOC_NEW |

					 EXTENT_LOCKED | EXTENT_DO_ACCOUNTING |

					 EXTENT_DEFRAG, 1, 0, &cached_state,

					 GFP_NOFS);

					 EXTENT_DEFRAG, 1, 0, &cached_state);

		/*

		 * whoever cleared the private bit is responsible

		 * for the finish_ordered_io
@@ -9047,7 +9045,7 @@ static void btrfs_invalidatepage(struct page *page, unsigned int offset, 
				 EXTENT_LOCKED | EXTENT_DIRTY |

				 EXTENT_DELALLOC | EXTENT_DELALLOC_NEW |

				 EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG, 1, 1,

				 &cached_state, GFP_NOFS);

				 &cached_state);



		__btrfs_releasepage(page, GFP_NOFS);

	}
@@ -9175,7 +9173,7 @@ int btrfs_page_mkwrite(struct vm_fault *vmf) 
	clear_extent_bit(&BTRFS_I(inode)->io_tree, page_start, end,

			  EXTENT_DIRTY | EXTENT_DELALLOC |

			  EXTENT_DO_ACCOUNTING | EXTENT_DEFRAG,

			  0, 0, &cached_state, GFP_NOFS);

			  0, 0, &cached_state);



	ret = btrfs_set_extent_delalloc(inode, page_start, end, 0,

					&cached_state, 0);