diff options
author | David Sterba <dsterba@suse.cz> | 2011-04-20 19:08:01 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2011-05-02 07:57:22 -0400 |
commit | f09d1f60e6aa82fb4cfaa525e21f6287fc1516f4 (patch) | |
tree | 7c9a5523e40bd08c962a5f87fb4d72228f14c211 | |
parent | 172ddd60a662c4d8bf2809462866ddddd6431ea5 (diff) |
btrfs: drop gfp parameter from find_extent_buffer
pass GFP_NOFS directly to kmem_cache_alloc
Signed-off-by: David Sterba <dsterba@suse.cz>
-rw-r--r-- | fs/btrfs/disk-io.c | 4 | ||||
-rw-r--r-- | fs/btrfs/extent_io.c | 3 | ||||
-rw-r--r-- | fs/btrfs/extent_io.h | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index e1e55679d061..1c0752e99066 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -963,7 +963,7 @@ struct extent_buffer *btrfs_find_tree_block(struct btrfs_root *root, | |||
963 | struct inode *btree_inode = root->fs_info->btree_inode; | 963 | struct inode *btree_inode = root->fs_info->btree_inode; |
964 | struct extent_buffer *eb; | 964 | struct extent_buffer *eb; |
965 | eb = find_extent_buffer(&BTRFS_I(btree_inode)->io_tree, | 965 | eb = find_extent_buffer(&BTRFS_I(btree_inode)->io_tree, |
966 | bytenr, blocksize, GFP_NOFS); | 966 | bytenr, blocksize); |
967 | return eb; | 967 | return eb; |
968 | } | 968 | } |
969 | 969 | ||
@@ -2696,7 +2696,7 @@ int btree_lock_page_hook(struct page *page) | |||
2696 | goto out; | 2696 | goto out; |
2697 | 2697 | ||
2698 | len = page->private >> 2; | 2698 | len = page->private >> 2; |
2699 | eb = find_extent_buffer(io_tree, bytenr, len, GFP_NOFS); | 2699 | eb = find_extent_buffer(io_tree, bytenr, len); |
2700 | if (!eb) | 2700 | if (!eb) |
2701 | goto out; | 2701 | goto out; |
2702 | 2702 | ||
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index e67ed76668e0..ad0f0a95ad3a 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c | |||
@@ -3377,8 +3377,7 @@ free_eb: | |||
3377 | } | 3377 | } |
3378 | 3378 | ||
3379 | struct extent_buffer *find_extent_buffer(struct extent_io_tree *tree, | 3379 | struct extent_buffer *find_extent_buffer(struct extent_io_tree *tree, |
3380 | u64 start, unsigned long len, | 3380 | u64 start, unsigned long len) |
3381 | gfp_t mask) | ||
3382 | { | 3381 | { |
3383 | struct extent_buffer *eb; | 3382 | struct extent_buffer *eb; |
3384 | 3383 | ||
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h index e9cfe8d1661c..ff220c3c01b0 100644 --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h | |||
@@ -263,8 +263,7 @@ struct extent_buffer *alloc_extent_buffer(struct extent_io_tree *tree, | |||
263 | struct page *page0, | 263 | struct page *page0, |
264 | gfp_t mask); | 264 | gfp_t mask); |
265 | struct extent_buffer *find_extent_buffer(struct extent_io_tree *tree, | 265 | struct extent_buffer *find_extent_buffer(struct extent_io_tree *tree, |
266 | u64 start, unsigned long len, | 266 | u64 start, unsigned long len); |
267 | gfp_t mask); | ||
268 | void free_extent_buffer(struct extent_buffer *eb); | 267 | void free_extent_buffer(struct extent_buffer *eb); |
269 | int read_extent_buffer_pages(struct extent_io_tree *tree, | 268 | int read_extent_buffer_pages(struct extent_io_tree *tree, |
270 | struct extent_buffer *eb, u64 start, int wait, | 269 | struct extent_buffer *eb, u64 start, int wait, |