diff options
author | David Sterba <dsterba@suse.com> | 2016-04-26 17:54:39 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2016-04-29 05:01:47 -0400 |
commit | 2c53b912ae317e560bce1fc446e76915a5b30587 (patch) | |
tree | a46230fa250c843058a4ee55e390b9338c8ed903 | |
parent | 3744dbeb7033825e53b919ae0887e08e924841a9 (diff) |
btrfs: sink gfp parameter to set_record_extent_bits
Single caller passes GFP_NOFS.
Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r-- | fs/btrfs/extent_io.c | 5 | ||||
-rw-r--r-- | fs/btrfs/extent_io.h | 3 | ||||
-rw-r--r-- | fs/btrfs/qgroup.c | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 164bda63c5ac..0c9b11924f74 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c | |||
@@ -1284,8 +1284,7 @@ search_again: | |||
1284 | 1284 | ||
1285 | /* wrappers around set/clear extent bit */ | 1285 | /* wrappers around set/clear extent bit */ |
1286 | int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, | 1286 | int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, |
1287 | unsigned bits, gfp_t mask, | 1287 | unsigned bits, struct extent_changeset *changeset) |
1288 | struct extent_changeset *changeset) | ||
1289 | { | 1288 | { |
1290 | /* | 1289 | /* |
1291 | * We don't support EXTENT_LOCKED yet, as current changeset will | 1290 | * We don't support EXTENT_LOCKED yet, as current changeset will |
@@ -1295,7 +1294,7 @@ int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, | |||
1295 | */ | 1294 | */ |
1296 | BUG_ON(bits & EXTENT_LOCKED); | 1295 | BUG_ON(bits & EXTENT_LOCKED); |
1297 | 1296 | ||
1298 | return __set_extent_bit(tree, start, end, bits, 0, NULL, NULL, mask, | 1297 | return __set_extent_bit(tree, start, end, bits, 0, NULL, NULL, GFP_NOFS, |
1299 | changeset); | 1298 | changeset); |
1300 | } | 1299 | } |
1301 | 1300 | ||
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h index 566cf86d7e63..94b376446042 100644 --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h | |||
@@ -252,8 +252,7 @@ static inline int clear_extent_bits(struct extent_io_tree *tree, u64 start, | |||
252 | } | 252 | } |
253 | 253 | ||
254 | int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, | 254 | int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, |
255 | unsigned bits, gfp_t mask, | 255 | unsigned bits, struct extent_changeset *changeset); |
256 | struct extent_changeset *changeset); | ||
257 | int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, | 256 | int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, |
258 | unsigned bits, u64 *failed_start, | 257 | unsigned bits, u64 *failed_start, |
259 | struct extent_state **cached_state, gfp_t mask); | 258 | struct extent_state **cached_state, gfp_t mask); |
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 129392a78986..34af959b4e0f 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c | |||
@@ -2542,8 +2542,7 @@ int btrfs_qgroup_reserve_data(struct inode *inode, u64 start, u64 len) | |||
2542 | changeset.bytes_changed = 0; | 2542 | changeset.bytes_changed = 0; |
2543 | changeset.range_changed = ulist_alloc(GFP_NOFS); | 2543 | changeset.range_changed = ulist_alloc(GFP_NOFS); |
2544 | ret = set_record_extent_bits(&BTRFS_I(inode)->io_tree, start, | 2544 | ret = set_record_extent_bits(&BTRFS_I(inode)->io_tree, start, |
2545 | start + len -1, EXTENT_QGROUP_RESERVED, GFP_NOFS, | 2545 | start + len -1, EXTENT_QGROUP_RESERVED, &changeset); |
2546 | &changeset); | ||
2547 | trace_btrfs_qgroup_reserve_data(inode, start, len, | 2546 | trace_btrfs_qgroup_reserve_data(inode, start, len, |
2548 | changeset.bytes_changed, | 2547 | changeset.bytes_changed, |
2549 | QGROUP_RESERVE); | 2548 | QGROUP_RESERVE); |