diff options
| author | David Sterba <dsterba@suse.com> | 2016-04-26 23:54:39 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-04-29 11:01:47 +0200 |
| commit | 2c53b912ae317e560bce1fc446e76915a5b30587 (patch) | |
| tree | a46230fa250c843058a4ee55e390b9338c8ed903 /fs/btrfs | |
| parent | 3744dbeb7033825e53b919ae0887e08e924841a9 (diff) | |
| download | linux-stable-2c53b912ae317e560bce1fc446e76915a5b30587.tar.gz linux-stable-2c53b912ae317e560bce1fc446e76915a5b30587.tar.bz2 linux-stable-2c53b912ae317e560bce1fc446e76915a5b30587.zip | |
btrfs: sink gfp parameter to set_record_extent_bits
Single caller passes GFP_NOFS.
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -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: /* wrappers around set/clear extent bit */ int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, - unsigned bits, gfp_t mask, - struct extent_changeset *changeset) + unsigned bits, struct extent_changeset *changeset) { /* * 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, */ BUG_ON(bits & EXTENT_LOCKED); - return __set_extent_bit(tree, start, end, bits, 0, NULL, NULL, mask, + return __set_extent_bit(tree, start, end, bits, 0, NULL, NULL, GFP_NOFS, changeset); } 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, } int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, - unsigned bits, gfp_t mask, - struct extent_changeset *changeset); + unsigned bits, struct extent_changeset *changeset); int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, unsigned bits, u64 *failed_start, 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) changeset.bytes_changed = 0; changeset.range_changed = ulist_alloc(GFP_NOFS); ret = set_record_extent_bits(&BTRFS_I(inode)->io_tree, start, - start + len -1, EXTENT_QGROUP_RESERVED, GFP_NOFS, - &changeset); + start + len -1, EXTENT_QGROUP_RESERVED, &changeset); trace_btrfs_qgroup_reserve_data(inode, start, len, changeset.bytes_changed, QGROUP_RESERVE); |