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
commitaf6f8f604d44e05f98ed45a69830547ed133adf8 (patch)
treed27887441a73a3e041f636c43e8f7ede42fe7c21
parentf734c44a1bfffd762f6f5829cb41224d267b80d9 (diff)
btrfs: sink gfp parameter to clear_extent_dirty
Callers pass GFP_NOFS. No need to pass the flags around. Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/disk-io.c2
-rw-r--r--fs/btrfs/extent-tree.c2
-rw-r--r--fs/btrfs/extent_io.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 3bc88b4b0032..263823f28ba4 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -4392,7 +4392,7 @@ again:
4392 if (ret) 4392 if (ret)
4393 break; 4393 break;
4394 4394
4395 clear_extent_dirty(unpin, start, end, GFP_NOFS); 4395 clear_extent_dirty(unpin, start, end);
4396 btrfs_error_unpin_extent_range(root, start, end); 4396 btrfs_error_unpin_extent_range(root, start, end);
4397 cond_resched(); 4397 cond_resched();
4398 } 4398 }
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index b1c6d7634e88..61b3dd25ba4c 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -6408,7 +6408,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans,
6408 ret = btrfs_discard_extent(root, start, 6408 ret = btrfs_discard_extent(root, start,
6409 end + 1 - start, NULL); 6409 end + 1 - start, NULL);
6410 6410
6411 clear_extent_dirty(unpin, start, end, GFP_NOFS); 6411 clear_extent_dirty(unpin, start, end);
6412 unpin_extent_range(root, start, end, true); 6412 unpin_extent_range(root, start, end, true);
6413 mutex_unlock(&fs_info->unused_bg_unpin_mutex); 6413 mutex_unlock(&fs_info->unused_bg_unpin_mutex);
6414 cond_resched(); 6414 cond_resched();
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index b7c258c9fa2d..9e987ee03361 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -279,11 +279,11 @@ static inline int set_extent_dirty(struct extent_io_tree *tree, u64 start,
279} 279}
280 280
281static inline int clear_extent_dirty(struct extent_io_tree *tree, u64 start, 281static inline int clear_extent_dirty(struct extent_io_tree *tree, u64 start,
282 u64 end, gfp_t mask) 282 u64 end)
283{ 283{
284 return clear_extent_bit(tree, start, end, 284 return clear_extent_bit(tree, start, end,
285 EXTENT_DIRTY | EXTENT_DELALLOC | 285 EXTENT_DIRTY | EXTENT_DELALLOC |
286 EXTENT_DO_ACCOUNTING, 0, 0, NULL, mask); 286 EXTENT_DO_ACCOUNTING, 0, 0, NULL, GFP_NOFS);
287} 287}
288 288
289int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, 289int convert_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,