提交 ceeb0ae7 编写于 作者: D David Sterba

btrfs: sink gfp parameter to set_extent_bits

All callers pass GFP_NOFS.
Signed-off-by: NDavid Sterba <dsterba@suse.com>
上级 02da2d72
...@@ -231,9 +231,9 @@ static int add_excluded_extent(struct btrfs_root *root, ...@@ -231,9 +231,9 @@ static int add_excluded_extent(struct btrfs_root *root,
{ {
u64 end = start + num_bytes - 1; u64 end = start + num_bytes - 1;
set_extent_bits(&root->fs_info->freed_extents[0], set_extent_bits(&root->fs_info->freed_extents[0],
start, end, EXTENT_UPTODATE, GFP_NOFS); start, end, EXTENT_UPTODATE);
set_extent_bits(&root->fs_info->freed_extents[1], set_extent_bits(&root->fs_info->freed_extents[1],
start, end, EXTENT_UPTODATE, GFP_NOFS); start, end, EXTENT_UPTODATE);
return 0; return 0;
} }
......
...@@ -2232,13 +2232,12 @@ int btrfs_get_io_failure_record(struct inode *inode, u64 start, u64 end, ...@@ -2232,13 +2232,12 @@ int btrfs_get_io_failure_record(struct inode *inode, u64 start, u64 end,
/* set the bits in the private failure tree */ /* set the bits in the private failure tree */
ret = set_extent_bits(failure_tree, start, end, ret = set_extent_bits(failure_tree, start, end,
EXTENT_LOCKED | EXTENT_DIRTY, GFP_NOFS); EXTENT_LOCKED | EXTENT_DIRTY);
if (ret >= 0) if (ret >= 0)
ret = set_state_failrec(failure_tree, start, failrec); ret = set_state_failrec(failure_tree, start, failrec);
/* set the bits in the inode's tree */ /* set the bits in the inode's tree */
if (ret >= 0) if (ret >= 0)
ret = set_extent_bits(tree, start, end, EXTENT_DAMAGED, ret = set_extent_bits(tree, start, end, EXTENT_DAMAGED);
GFP_NOFS);
if (ret < 0) { if (ret < 0) {
kfree(failrec); kfree(failrec);
return ret; return ret;
......
...@@ -259,9 +259,9 @@ int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end, ...@@ -259,9 +259,9 @@ int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
struct extent_state **cached_state, gfp_t mask); struct extent_state **cached_state, gfp_t mask);
static inline int set_extent_bits(struct extent_io_tree *tree, u64 start, static inline int set_extent_bits(struct extent_io_tree *tree, u64 start,
u64 end, unsigned bits, gfp_t mask) u64 end, unsigned bits)
{ {
return set_extent_bit(tree, start, end, bits, NULL, NULL, mask); return set_extent_bit(tree, start, end, bits, NULL, NULL, GFP_NOFS);
} }
static inline int clear_extent_uptodate(struct extent_io_tree *tree, u64 start, static inline int clear_extent_uptodate(struct extent_io_tree *tree, u64 start,
......
...@@ -248,7 +248,7 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root, ...@@ -248,7 +248,7 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
BTRFS_DATA_RELOC_TREE_OBJECTID) { BTRFS_DATA_RELOC_TREE_OBJECTID) {
set_extent_bits(io_tree, offset, set_extent_bits(io_tree, offset,
offset + root->sectorsize - 1, offset + root->sectorsize - 1,
EXTENT_NODATASUM, GFP_NOFS); EXTENT_NODATASUM);
} else { } else {
btrfs_info(BTRFS_I(inode)->root->fs_info, btrfs_info(BTRFS_I(inode)->root->fs_info,
"no csum found for inode %llu start %llu", "no csum found for inode %llu start %llu",
......
...@@ -2814,7 +2814,7 @@ static void mark_block_processed(struct reloc_control *rc, ...@@ -2814,7 +2814,7 @@ static void mark_block_processed(struct reloc_control *rc,
u64 bytenr, u32 blocksize) u64 bytenr, u32 blocksize)
{ {
set_extent_bits(&rc->processed_blocks, bytenr, bytenr + blocksize - 1, set_extent_bits(&rc->processed_blocks, bytenr, bytenr + blocksize - 1,
EXTENT_DIRTY, GFP_NOFS); EXTENT_DIRTY);
} }
static void __mark_block_processed(struct reloc_control *rc, static void __mark_block_processed(struct reloc_control *rc,
...@@ -3182,7 +3182,7 @@ static int relocate_file_extent_cluster(struct inode *inode, ...@@ -3182,7 +3182,7 @@ static int relocate_file_extent_cluster(struct inode *inode,
page_start + offset == cluster->boundary[nr]) { page_start + offset == cluster->boundary[nr]) {
set_extent_bits(&BTRFS_I(inode)->io_tree, set_extent_bits(&BTRFS_I(inode)->io_tree,
page_start, page_end, page_start, page_end,
EXTENT_BOUNDARY, GFP_NOFS); EXTENT_BOUNDARY);
nr++; nr++;
} }
......
...@@ -745,7 +745,7 @@ static int scrub_fixup_readpage(u64 inum, u64 offset, u64 root, void *fixup_ctx) ...@@ -745,7 +745,7 @@ static int scrub_fixup_readpage(u64 inum, u64 offset, u64 root, void *fixup_ctx)
* sure we read the bad mirror. * sure we read the bad mirror.
*/ */
ret = set_extent_bits(&BTRFS_I(inode)->io_tree, offset, end, ret = set_extent_bits(&BTRFS_I(inode)->io_tree, offset, end,
EXTENT_DAMAGED, GFP_NOFS); EXTENT_DAMAGED);
if (ret) { if (ret) {
/* set_extent_bits should give proper error */ /* set_extent_bits should give proper error */
WARN_ON(ret > 0); WARN_ON(ret > 0);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册