diff options
| author | David Sterba | 2016-04-26 23:54:39 +0200 |
|---|---|---|
| committer | David Sterba | 2016-04-29 11:01:47 +0200 |
| commit | 3744dbeb7033825e53b919ae0887e08e924841a9 (patch) | |
| tree | 74a2fa55ef9edb868d0297abf25fc0ed9ee8915a | |
| parent | btrfs: sink gfp parameter to set_extent_defrag (diff) | |
| download | kernel-qcow2-linux-3744dbeb7033825e53b919ae0887e08e924841a9.tar.gz kernel-qcow2-linux-3744dbeb7033825e53b919ae0887e08e924841a9.tar.xz kernel-qcow2-linux-3744dbeb7033825e53b919ae0887e08e924841a9.zip | |
btrfs: sink gfp parameter to set_extent_new
Single caller passes GFP_NOFS.
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/extent-tree.c | 2 | ||||
| -rw-r--r-- | fs/btrfs/extent_io.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 61b3dd25ba4c..0ddc996a40e1 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -7923,7 +7923,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root, buf->start + buf->len - 1, GFP_NOFS); else set_extent_new(&root->dirty_log_pages, buf->start, - buf->start + buf->len - 1, GFP_NOFS); + buf->start + buf->len - 1); } else { buf->log_index = -1; set_extent_dirty(&trans->transaction->dirty_pages, buf->start, diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h index a1cf4b1dd290..566cf86d7e63 100644 --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h @@ -307,9 +307,10 @@ static inline int set_extent_defrag(struct extent_io_tree *tree, u64 start, } static inline int set_extent_new(struct extent_io_tree *tree, u64 start, - u64 end, gfp_t mask) + u64 end) { - return set_extent_bit(tree, start, end, EXTENT_NEW, NULL, NULL, mask); + return set_extent_bit(tree, start, end, EXTENT_NEW, NULL, NULL, + GFP_NOFS); } static inline int set_extent_uptodate(struct extent_io_tree *tree, u64 start, |