diff options
| author |   Qu Wenruo <quwenruo@cn.fujitsu.com> | 2015-10-08 18:19:37 +0800 |
|---|---|---|
| committer |   Chris Mason <clm@fb.com> | 2015-10-21 18:41:09 -0700 |
| commit | 51773bec7ea352f3b9afa11ecfc72324c7977335 (patch) | |
| tree | 3d2c52d2424e01df54e3ac6bd060028d293235b1 /fs/btrfs/inode.c | |
| parent | btrfs: fallocate: Add support to accurate qgroup reserve (diff) | |
| download | linux-dev-51773bec7ea352f3b9afa11ecfc72324c7977335.tar.xz linux-dev-51773bec7ea352f3b9afa11ecfc72324c7977335.zip | |
btrfs: qgroup: Avoid calling btrfs_free_reserved_data_space in clear_bit_hook
In clear_bit_hook, qgroup reserved data is already handled quite well,
either released by finish_ordered_io or invalidatepage.
So calling btrfs_qgroup_free_data() here is completely meaningless, and
since btrfs_qgroup_free_data() will lock io_tree, so it can't be called
with io_tree lock hold.
This patch will add a new function
btrfs_free_reserved_data_space_noquota() for clear_bit_hook() to cease
the lockdep warning.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/btrfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 6670792704e8..3229c1346ea2 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1776,8 +1776,8 @@ static void btrfs_clear_bit_hook(struct inode *inode, if (root->root_key.objectid != BTRFS_DATA_RELOC_TREE_OBJECTID && do_list && !(state->state & EXTENT_NORESERVE)) - btrfs_free_reserved_data_space(inode, state->start, - len); + btrfs_free_reserved_data_space_noquota(inode, + state->start, len); __percpu_counter_add(&root->fs_info->delalloc_bytes, -len, root->fs_info->delalloc_batch); |