aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2016-04-26 17:54:39 -0400
committerDavid Sterba <dsterba@suse.com>2016-04-29 05:01:47 -0400
commitceeb0ae7bf42a3deaaaee981d2da02e5d3ad2b0f (patch)
tree19b30e6a6107b68b7f40567d0c05f9458ec27832
parent02da2d72174c61988eb4456b53f405e3ebdebce4 (diff)
btrfs: sink gfp parameter to set_extent_bits
All callers pass GFP_NOFS. Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/extent-tree.c4
-rw-r--r--fs/btrfs/extent_io.c5
-rw-r--r--fs/btrfs/extent_io.h4
-rw-r--r--fs/btrfs/file-item.c2
-rw-r--r--fs/btrfs/relocation.c4
-rw-r--r--fs/btrfs/scrub.c2
6 files changed, 10 insertions, 11 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 84e060eb0de8..0cfddbe8abba 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -231,9 +231,9 @@ static int add_excluded_extent(struct btrfs_root *root,
231{ 231{
232 u64 end = start + num_bytes - 1; 232 u64 end = start + num_bytes - 1;
233 set_extent_bits(&root->fs_info->freed_extents[0], 233 set_extent_bits(&root->fs_info->freed_extents[0],
234 start, end, EXTENT_UPTODATE, GFP_NOFS); 234 start, end, EXTENT_UPTODATE);
235 set_extent_bits(&root->fs_info->freed_extents[1], 235 set_extent_bits(&root->fs_info->freed_extents[1],
236 start, end, EXTENT_UPTODATE, GFP_NOFS); 236 start, end, EXTENT_UPTODATE);
237 return 0; 237 return 0;
238} 238}
239 239
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index d247fc0eea19..3b53d217066c 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2232,13 +2232,12 @@ int btrfs_get_io_failure_record(struct inode *inode, u64 start, u64 end,
2232 2232
2233 /* set the bits in the private failure tree */ 2233 /* set the bits in the private failure tree */
2234 ret = set_extent_bits(failure_tree, start, end, 2234 ret = set_extent_bits(failure_tree, start, end,
2235 EXTENT_LOCKED | EXTENT_DIRTY, GFP_NOFS); 2235 EXTENT_LOCKED | EXTENT_DIRTY);
2236 if (ret >= 0) 2236 if (ret >= 0)
2237 ret = set_state_failrec(failure_tree, start, failrec); 2237 ret = set_state_failrec(failure_tree, start, failrec);
2238 /* set the bits in the inode's tree */ 2238 /* set the bits in the inode's tree */
2239 if (ret >= 0) 2239 if (ret >= 0)
2240 ret = set_extent_bits(tree, start, end, EXTENT_DAMAGED, 2240 ret = set_extent_bits(tree, start, end, EXTENT_DAMAGED);
2241 GFP_NOFS);
2242 if (ret < 0) { 2241 if (ret < 0) {
2243 kfree(failrec); 2242 kfree(failrec);
2244 return ret; 2243 return ret;
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index b5e0ade90e88..447c6e6ff88c 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -259,9 +259,9 @@ int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
259 struct extent_state **cached_state, gfp_t mask); 259 struct extent_state **cached_state, gfp_t mask);
260 260
261static inline int set_extent_bits(struct extent_io_tree *tree, u64 start, 261static inline int set_extent_bits(struct extent_io_tree *tree, u64 start,
262 u64 end, unsigned bits, gfp_t mask) 262 u64 end, unsigned bits)
263{ 263{
264 return set_extent_bit(tree, start, end, bits, NULL, NULL, mask); 264 return set_extent_bit(tree, start, end, bits, NULL, NULL, GFP_NOFS);
265} 265}
266 266
267static inline int clear_extent_uptodate(struct extent_io_tree *tree, u64 start, 267static inline int clear_extent_uptodate(struct extent_io_tree *tree, u64 start,
diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index 7a7d6e253cfc..62a81ee13a5f 100644
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -248,7 +248,7 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
248 BTRFS_DATA_RELOC_TREE_OBJECTID) { 248 BTRFS_DATA_RELOC_TREE_OBJECTID) {
249 set_extent_bits(io_tree, offset, 249 set_extent_bits(io_tree, offset,
250 offset + root->sectorsize - 1, 250 offset + root->sectorsize - 1,
251 EXTENT_NODATASUM, GFP_NOFS); 251 EXTENT_NODATASUM);
252 } else { 252 } else {
253 btrfs_info(BTRFS_I(inode)->root->fs_info, 253 btrfs_info(BTRFS_I(inode)->root->fs_info,
254 "no csum found for inode %llu start %llu", 254 "no csum found for inode %llu start %llu",
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 08ef890deca6..78cbfb530de6 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2814,7 +2814,7 @@ static void mark_block_processed(struct reloc_control *rc,
2814 u64 bytenr, u32 blocksize) 2814 u64 bytenr, u32 blocksize)
2815{ 2815{
2816 set_extent_bits(&rc->processed_blocks, bytenr, bytenr + blocksize - 1, 2816 set_extent_bits(&rc->processed_blocks, bytenr, bytenr + blocksize - 1,
2817 EXTENT_DIRTY, GFP_NOFS); 2817 EXTENT_DIRTY);
2818} 2818}
2819 2819
2820static void __mark_block_processed(struct reloc_control *rc, 2820static void __mark_block_processed(struct reloc_control *rc,
@@ -3182,7 +3182,7 @@ static int relocate_file_extent_cluster(struct inode *inode,
3182 page_start + offset == cluster->boundary[nr]) { 3182 page_start + offset == cluster->boundary[nr]) {
3183 set_extent_bits(&BTRFS_I(inode)->io_tree, 3183 set_extent_bits(&BTRFS_I(inode)->io_tree,
3184 page_start, page_end, 3184 page_start, page_end,
3185 EXTENT_BOUNDARY, GFP_NOFS); 3185 EXTENT_BOUNDARY);
3186 nr++; 3186 nr++;
3187 } 3187 }
3188 3188
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 4678f03e878e..9d24375eed1f 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -745,7 +745,7 @@ static int scrub_fixup_readpage(u64 inum, u64 offset, u64 root, void *fixup_ctx)
745 * sure we read the bad mirror. 745 * sure we read the bad mirror.
746 */ 746 */
747 ret = set_extent_bits(&BTRFS_I(inode)->io_tree, offset, end, 747 ret = set_extent_bits(&BTRFS_I(inode)->io_tree, offset, end,
748 EXTENT_DAMAGED, GFP_NOFS); 748 EXTENT_DAMAGED);
749 if (ret) { 749 if (ret) {
750 /* set_extent_bits should give proper error */ 750 /* set_extent_bits should give proper error */
751 WARN_ON(ret > 0); 751 WARN_ON(ret > 0);