forked from mirrors/linux
		
	btrfs: qgroup: Fix qgroup reserved space underflow by only freeing reserved ranges
[BUG]
For the following case, btrfs can underflow qgroup reserved space
at an error path:
(Page size 4K, function name without "btrfs_" prefix)
         Task A                  |             Task B
----------------------------------------------------------------------
Buffered_write [0, 2K)           |
|- check_data_free_space()       |
|  |- qgroup_reserve_data()      |
|     Range aligned to page      |
|     range [0, 4K)          <<< |
|     4K bytes reserved      <<< |
|- copy pages to page cache      |
                                 | Buffered_write [2K, 4K)
                                 | |- check_data_free_space()
                                 | |  |- qgroup_reserved_data()
                                 | |     Range alinged to page
                                 | |     range [0, 4K)
                                 | |     Already reserved by A <<<
                                 | |     0 bytes reserved      <<<
                                 | |- delalloc_reserve_metadata()
                                 | |  And it *FAILED* (Maybe EQUOTA)
                                 | |- free_reserved_data_space()
                                      |- qgroup_free_data()
                                         Range aligned to page range
                                         [0, 4K)
                                         Freeing 4K
(Special thanks to Chandan for the detailed report and analyse)
[CAUSE]
Above Task B is freeing reserved data range [0, 4K) which is actually
reserved by Task A.
And at writeback time, page dirty by Task A will go through writeback
routine, which will free 4K reserved data space at file extent insert
time, causing the qgroup underflow.
[FIX]
For btrfs_qgroup_free_data(), add @reserved parameter to only free
data ranges reserved by previous btrfs_qgroup_reserve_data().
So in above case, Task B will try to free 0 byte, so no underflow.
Reported-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Reviewed-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
Tested-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
Signed-off-by: David Sterba <dsterba@suse.com>
			
			
This commit is contained in:
		
							parent
							
								
									364ecf3651
								
							
						
					
					
						commit
						bc42bda223
					
				
					 8 changed files with 117 additions and 46 deletions
				
			
		| 
						 | 
					@ -2711,7 +2711,10 @@ enum btrfs_flush_state {
 | 
				
			||||||
int btrfs_alloc_data_chunk_ondemand(struct btrfs_inode *inode, u64 bytes);
 | 
					int btrfs_alloc_data_chunk_ondemand(struct btrfs_inode *inode, u64 bytes);
 | 
				
			||||||
int btrfs_check_data_free_space(struct inode *inode,
 | 
					int btrfs_check_data_free_space(struct inode *inode,
 | 
				
			||||||
			struct extent_changeset **reserved, u64 start, u64 len);
 | 
								struct extent_changeset **reserved, u64 start, u64 len);
 | 
				
			||||||
void btrfs_free_reserved_data_space(struct inode *inode, u64 start, u64 len);
 | 
					void btrfs_free_reserved_data_space(struct inode *inode,
 | 
				
			||||||
 | 
								struct extent_changeset *reserved, u64 start, u64 len);
 | 
				
			||||||
 | 
					void btrfs_delalloc_release_space(struct inode *inode,
 | 
				
			||||||
 | 
								struct extent_changeset *reserved, u64 start, u64 len);
 | 
				
			||||||
void btrfs_free_reserved_data_space_noquota(struct inode *inode, u64 start,
 | 
					void btrfs_free_reserved_data_space_noquota(struct inode *inode, u64 start,
 | 
				
			||||||
					    u64 len);
 | 
										    u64 len);
 | 
				
			||||||
void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans,
 | 
					void btrfs_trans_release_metadata(struct btrfs_trans_handle *trans,
 | 
				
			||||||
| 
						 | 
					@ -2730,7 +2733,6 @@ int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes);
 | 
				
			||||||
void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes);
 | 
					void btrfs_delalloc_release_metadata(struct btrfs_inode *inode, u64 num_bytes);
 | 
				
			||||||
int btrfs_delalloc_reserve_space(struct inode *inode,
 | 
					int btrfs_delalloc_reserve_space(struct inode *inode,
 | 
				
			||||||
			struct extent_changeset **reserved, u64 start, u64 len);
 | 
								struct extent_changeset **reserved, u64 start, u64 len);
 | 
				
			||||||
void btrfs_delalloc_release_space(struct inode *inode, u64 start, u64 len);
 | 
					 | 
				
			||||||
void btrfs_init_block_rsv(struct btrfs_block_rsv *rsv, unsigned short type);
 | 
					void btrfs_init_block_rsv(struct btrfs_block_rsv *rsv, unsigned short type);
 | 
				
			||||||
struct btrfs_block_rsv *btrfs_alloc_block_rsv(struct btrfs_fs_info *fs_info,
 | 
					struct btrfs_block_rsv *btrfs_alloc_block_rsv(struct btrfs_fs_info *fs_info,
 | 
				
			||||||
					      unsigned short type);
 | 
										      unsigned short type);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4389,7 +4389,8 @@ void btrfs_free_reserved_data_space_noquota(struct inode *inode, u64 start,
 | 
				
			||||||
 * This one will handle the per-inode data rsv map for accurate reserved
 | 
					 * This one will handle the per-inode data rsv map for accurate reserved
 | 
				
			||||||
 * space framework.
 | 
					 * space framework.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
void btrfs_free_reserved_data_space(struct inode *inode, u64 start, u64 len)
 | 
					void btrfs_free_reserved_data_space(struct inode *inode,
 | 
				
			||||||
 | 
								struct extent_changeset *reserved, u64 start, u64 len)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct btrfs_root *root = BTRFS_I(inode)->root;
 | 
						struct btrfs_root *root = BTRFS_I(inode)->root;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4399,7 +4400,7 @@ void btrfs_free_reserved_data_space(struct inode *inode, u64 start, u64 len)
 | 
				
			||||||
	start = round_down(start, root->fs_info->sectorsize);
 | 
						start = round_down(start, root->fs_info->sectorsize);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	btrfs_free_reserved_data_space_noquota(inode, start, len);
 | 
						btrfs_free_reserved_data_space_noquota(inode, start, len);
 | 
				
			||||||
	btrfs_qgroup_free_data(inode, start, len);
 | 
						btrfs_qgroup_free_data(inode, reserved, start, len);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void force_metadata_allocation(struct btrfs_fs_info *info)
 | 
					static void force_metadata_allocation(struct btrfs_fs_info *info)
 | 
				
			||||||
| 
						 | 
					@ -6204,7 +6205,7 @@ int btrfs_delalloc_reserve_space(struct inode *inode,
 | 
				
			||||||
		return ret;
 | 
							return ret;
 | 
				
			||||||
	ret = btrfs_delalloc_reserve_metadata(BTRFS_I(inode), len);
 | 
						ret = btrfs_delalloc_reserve_metadata(BTRFS_I(inode), len);
 | 
				
			||||||
	if (ret < 0)
 | 
						if (ret < 0)
 | 
				
			||||||
		btrfs_free_reserved_data_space(inode, start, len);
 | 
							btrfs_free_reserved_data_space(inode, *reserved, start, len);
 | 
				
			||||||
	return ret;
 | 
						return ret;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6223,10 +6224,11 @@ int btrfs_delalloc_reserve_space(struct inode *inode,
 | 
				
			||||||
 * list if there are no delalloc bytes left.
 | 
					 * list if there are no delalloc bytes left.
 | 
				
			||||||
 * Also it will handle the qgroup reserved space.
 | 
					 * Also it will handle the qgroup reserved space.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
void btrfs_delalloc_release_space(struct inode *inode, u64 start, u64 len)
 | 
					void btrfs_delalloc_release_space(struct inode *inode,
 | 
				
			||||||
 | 
								struct extent_changeset *reserved, u64 start, u64 len)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	btrfs_delalloc_release_metadata(BTRFS_I(inode), len);
 | 
						btrfs_delalloc_release_metadata(BTRFS_I(inode), len);
 | 
				
			||||||
	btrfs_free_reserved_data_space(inode, start, len);
 | 
						btrfs_free_reserved_data_space(inode, reserved, start, len);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int update_block_group(struct btrfs_trans_handle *trans,
 | 
					static int update_block_group(struct btrfs_trans_handle *trans,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1660,8 +1660,9 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
 | 
				
			||||||
				reserve_bytes);
 | 
									reserve_bytes);
 | 
				
			||||||
		if (ret) {
 | 
							if (ret) {
 | 
				
			||||||
			if (!only_release_metadata)
 | 
								if (!only_release_metadata)
 | 
				
			||||||
				btrfs_free_reserved_data_space(inode, pos,
 | 
									btrfs_free_reserved_data_space(inode,
 | 
				
			||||||
							       write_bytes);
 | 
											data_reserved, pos,
 | 
				
			||||||
 | 
											write_bytes);
 | 
				
			||||||
			else
 | 
								else
 | 
				
			||||||
				btrfs_end_write_no_snapshoting(root);
 | 
									btrfs_end_write_no_snapshoting(root);
 | 
				
			||||||
			break;
 | 
								break;
 | 
				
			||||||
| 
						 | 
					@ -1743,8 +1744,9 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
 | 
				
			||||||
				__pos = round_down(pos,
 | 
									__pos = round_down(pos,
 | 
				
			||||||
						   fs_info->sectorsize) +
 | 
											   fs_info->sectorsize) +
 | 
				
			||||||
					(dirty_pages << PAGE_SHIFT);
 | 
										(dirty_pages << PAGE_SHIFT);
 | 
				
			||||||
				btrfs_delalloc_release_space(inode, __pos,
 | 
									btrfs_delalloc_release_space(inode,
 | 
				
			||||||
							     release_bytes);
 | 
											data_reserved, __pos,
 | 
				
			||||||
 | 
											release_bytes);
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1799,9 +1801,9 @@ static noinline ssize_t __btrfs_buffered_write(struct file *file,
 | 
				
			||||||
			btrfs_delalloc_release_metadata(BTRFS_I(inode),
 | 
								btrfs_delalloc_release_metadata(BTRFS_I(inode),
 | 
				
			||||||
					release_bytes);
 | 
										release_bytes);
 | 
				
			||||||
		} else {
 | 
							} else {
 | 
				
			||||||
			btrfs_delalloc_release_space(inode,
 | 
								btrfs_delalloc_release_space(inode, data_reserved,
 | 
				
			||||||
						round_down(pos, fs_info->sectorsize),
 | 
										round_down(pos, fs_info->sectorsize),
 | 
				
			||||||
						release_bytes);
 | 
										release_bytes);
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2918,8 +2920,8 @@ static long btrfs_fallocate(struct file *file, int mode,
 | 
				
			||||||
			 * range, free reserved data space first, otherwise
 | 
								 * range, free reserved data space first, otherwise
 | 
				
			||||||
			 * it'll result in false ENOSPC error.
 | 
								 * it'll result in false ENOSPC error.
 | 
				
			||||||
			 */
 | 
								 */
 | 
				
			||||||
			btrfs_free_reserved_data_space(inode, cur_offset,
 | 
								btrfs_free_reserved_data_space(inode, data_reserved,
 | 
				
			||||||
				last_byte - cur_offset);
 | 
										cur_offset, last_byte - cur_offset);
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		free_extent_map(em);
 | 
							free_extent_map(em);
 | 
				
			||||||
		cur_offset = last_byte;
 | 
							cur_offset = last_byte;
 | 
				
			||||||
| 
						 | 
					@ -2938,8 +2940,9 @@ static long btrfs_fallocate(struct file *file, int mode,
 | 
				
			||||||
					range->len, i_blocksize(inode),
 | 
										range->len, i_blocksize(inode),
 | 
				
			||||||
					offset + len, &alloc_hint);
 | 
										offset + len, &alloc_hint);
 | 
				
			||||||
		else
 | 
							else
 | 
				
			||||||
			btrfs_free_reserved_data_space(inode, range->start,
 | 
								btrfs_free_reserved_data_space(inode,
 | 
				
			||||||
						       range->len);
 | 
										data_reserved, range->start,
 | 
				
			||||||
 | 
										range->len);
 | 
				
			||||||
		list_del(&range->list);
 | 
							list_del(&range->list);
 | 
				
			||||||
		kfree(range);
 | 
							kfree(range);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
| 
						 | 
					@ -2977,8 +2980,8 @@ static long btrfs_fallocate(struct file *file, int mode,
 | 
				
			||||||
	inode_unlock(inode);
 | 
						inode_unlock(inode);
 | 
				
			||||||
	/* Let go of our reservation. */
 | 
						/* Let go of our reservation. */
 | 
				
			||||||
	if (ret != 0)
 | 
						if (ret != 0)
 | 
				
			||||||
		btrfs_free_reserved_data_space(inode, alloc_start,
 | 
							btrfs_free_reserved_data_space(inode, data_reserved,
 | 
				
			||||||
				       alloc_end - cur_offset);
 | 
									alloc_start, alloc_end - cur_offset);
 | 
				
			||||||
	extent_changeset_free(data_reserved);
 | 
						extent_changeset_free(data_reserved);
 | 
				
			||||||
	return ret;
 | 
						return ret;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -345,7 +345,7 @@ static noinline int cow_file_range_inline(struct btrfs_root *root,
 | 
				
			||||||
	 * And at reserve time, it's always aligned to page size, so
 | 
						 * And at reserve time, it's always aligned to page size, so
 | 
				
			||||||
	 * just free one page here.
 | 
						 * just free one page here.
 | 
				
			||||||
	 */
 | 
						 */
 | 
				
			||||||
	btrfs_qgroup_free_data(inode, 0, PAGE_SIZE);
 | 
						btrfs_qgroup_free_data(inode, NULL, 0, PAGE_SIZE);
 | 
				
			||||||
	btrfs_free_path(path);
 | 
						btrfs_free_path(path);
 | 
				
			||||||
	btrfs_end_transaction(trans);
 | 
						btrfs_end_transaction(trans);
 | 
				
			||||||
	return ret;
 | 
						return ret;
 | 
				
			||||||
| 
						 | 
					@ -2935,7 +2935,7 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
 | 
				
			||||||
		 * space for NOCOW range.
 | 
							 * space for NOCOW range.
 | 
				
			||||||
		 * As NOCOW won't cause a new delayed ref, just free the space
 | 
							 * As NOCOW won't cause a new delayed ref, just free the space
 | 
				
			||||||
		 */
 | 
							 */
 | 
				
			||||||
		btrfs_qgroup_free_data(inode, ordered_extent->file_offset,
 | 
							btrfs_qgroup_free_data(inode, NULL, ordered_extent->file_offset,
 | 
				
			||||||
				       ordered_extent->len);
 | 
									       ordered_extent->len);
 | 
				
			||||||
		btrfs_ordered_update_i_size(inode, 0, ordered_extent);
 | 
							btrfs_ordered_update_i_size(inode, 0, ordered_extent);
 | 
				
			||||||
		if (nolock)
 | 
							if (nolock)
 | 
				
			||||||
| 
						 | 
					@ -4794,7 +4794,7 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len,
 | 
				
			||||||
again:
 | 
					again:
 | 
				
			||||||
	page = find_or_create_page(mapping, index, mask);
 | 
						page = find_or_create_page(mapping, index, mask);
 | 
				
			||||||
	if (!page) {
 | 
						if (!page) {
 | 
				
			||||||
		btrfs_delalloc_release_space(inode,
 | 
							btrfs_delalloc_release_space(inode, data_reserved,
 | 
				
			||||||
				round_down(from, blocksize),
 | 
									round_down(from, blocksize),
 | 
				
			||||||
				blocksize);
 | 
									blocksize);
 | 
				
			||||||
		ret = -ENOMEM;
 | 
							ret = -ENOMEM;
 | 
				
			||||||
| 
						 | 
					@ -4866,7 +4866,7 @@ int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
out_unlock:
 | 
					out_unlock:
 | 
				
			||||||
	if (ret)
 | 
						if (ret)
 | 
				
			||||||
		btrfs_delalloc_release_space(inode, block_start,
 | 
							btrfs_delalloc_release_space(inode, data_reserved, block_start,
 | 
				
			||||||
					     blocksize);
 | 
										     blocksize);
 | 
				
			||||||
	unlock_page(page);
 | 
						unlock_page(page);
 | 
				
			||||||
	put_page(page);
 | 
						put_page(page);
 | 
				
			||||||
| 
						 | 
					@ -5266,7 +5266,7 @@ static void evict_inode_truncate_pages(struct inode *inode)
 | 
				
			||||||
		 * Note, end is the bytenr of last byte, so we need + 1 here.
 | 
							 * Note, end is the bytenr of last byte, so we need + 1 here.
 | 
				
			||||||
		 */
 | 
							 */
 | 
				
			||||||
		if (state->state & EXTENT_DELALLOC)
 | 
							if (state->state & EXTENT_DELALLOC)
 | 
				
			||||||
			btrfs_qgroup_free_data(inode, start, end - start + 1);
 | 
								btrfs_qgroup_free_data(inode, NULL, start, end - start + 1);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		clear_extent_bit(io_tree, start, end,
 | 
							clear_extent_bit(io_tree, start, end,
 | 
				
			||||||
				 EXTENT_LOCKED | EXTENT_DIRTY |
 | 
									 EXTENT_LOCKED | EXTENT_DIRTY |
 | 
				
			||||||
| 
						 | 
					@ -8792,8 +8792,8 @@ static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
 | 
				
			||||||
		current->journal_info = NULL;
 | 
							current->journal_info = NULL;
 | 
				
			||||||
		if (ret < 0 && ret != -EIOCBQUEUED) {
 | 
							if (ret < 0 && ret != -EIOCBQUEUED) {
 | 
				
			||||||
			if (dio_data.reserve)
 | 
								if (dio_data.reserve)
 | 
				
			||||||
				btrfs_delalloc_release_space(inode, offset,
 | 
									btrfs_delalloc_release_space(inode, data_reserved,
 | 
				
			||||||
							     dio_data.reserve);
 | 
										offset, dio_data.reserve);
 | 
				
			||||||
			/*
 | 
								/*
 | 
				
			||||||
			 * On error we might have left some ordered extents
 | 
								 * On error we might have left some ordered extents
 | 
				
			||||||
			 * without submitting corresponding bios for them, so
 | 
								 * without submitting corresponding bios for them, so
 | 
				
			||||||
| 
						 | 
					@ -8808,8 +8808,8 @@ static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
 | 
				
			||||||
					dio_data.unsubmitted_oe_range_start,
 | 
										dio_data.unsubmitted_oe_range_start,
 | 
				
			||||||
					false);
 | 
										false);
 | 
				
			||||||
		} else if (ret >= 0 && (size_t)ret < count)
 | 
							} else if (ret >= 0 && (size_t)ret < count)
 | 
				
			||||||
			btrfs_delalloc_release_space(inode, offset,
 | 
								btrfs_delalloc_release_space(inode, data_reserved,
 | 
				
			||||||
						     count - (size_t)ret);
 | 
										offset, count - (size_t)ret);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
out:
 | 
					out:
 | 
				
			||||||
	if (wakeup)
 | 
						if (wakeup)
 | 
				
			||||||
| 
						 | 
					@ -9008,7 +9008,7 @@ static void btrfs_invalidatepage(struct page *page, unsigned int offset,
 | 
				
			||||||
	 *    free the entire extent.
 | 
						 *    free the entire extent.
 | 
				
			||||||
	 */
 | 
						 */
 | 
				
			||||||
	if (PageDirty(page))
 | 
						if (PageDirty(page))
 | 
				
			||||||
		btrfs_qgroup_free_data(inode, page_start, PAGE_SIZE);
 | 
							btrfs_qgroup_free_data(inode, NULL, page_start, PAGE_SIZE);
 | 
				
			||||||
	if (!inode_evicting) {
 | 
						if (!inode_evicting) {
 | 
				
			||||||
		clear_extent_bit(tree, page_start, page_end,
 | 
							clear_extent_bit(tree, page_start, page_end,
 | 
				
			||||||
				 EXTENT_LOCKED | EXTENT_DIRTY |
 | 
									 EXTENT_LOCKED | EXTENT_DIRTY |
 | 
				
			||||||
| 
						 | 
					@ -9130,8 +9130,8 @@ int btrfs_page_mkwrite(struct vm_fault *vmf)
 | 
				
			||||||
			spin_lock(&BTRFS_I(inode)->lock);
 | 
								spin_lock(&BTRFS_I(inode)->lock);
 | 
				
			||||||
			BTRFS_I(inode)->outstanding_extents++;
 | 
								BTRFS_I(inode)->outstanding_extents++;
 | 
				
			||||||
			spin_unlock(&BTRFS_I(inode)->lock);
 | 
								spin_unlock(&BTRFS_I(inode)->lock);
 | 
				
			||||||
			btrfs_delalloc_release_space(inode, page_start,
 | 
								btrfs_delalloc_release_space(inode, data_reserved,
 | 
				
			||||||
						PAGE_SIZE - reserved_space);
 | 
										page_start, PAGE_SIZE - reserved_space);
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -9187,7 +9187,8 @@ int btrfs_page_mkwrite(struct vm_fault *vmf)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	unlock_page(page);
 | 
						unlock_page(page);
 | 
				
			||||||
out:
 | 
					out:
 | 
				
			||||||
	btrfs_delalloc_release_space(inode, page_start, reserved_space);
 | 
						btrfs_delalloc_release_space(inode, data_reserved, page_start,
 | 
				
			||||||
 | 
									     reserved_space);
 | 
				
			||||||
out_noreserve:
 | 
					out_noreserve:
 | 
				
			||||||
	sb_end_pagefault(inode->i_sb);
 | 
						sb_end_pagefault(inode->i_sb);
 | 
				
			||||||
	extent_changeset_free(data_reserved);
 | 
						extent_changeset_free(data_reserved);
 | 
				
			||||||
| 
						 | 
					@ -10557,7 +10558,7 @@ static int __btrfs_prealloc_file_range(struct inode *inode, int mode,
 | 
				
			||||||
			btrfs_end_transaction(trans);
 | 
								btrfs_end_transaction(trans);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	if (cur_offset < end)
 | 
						if (cur_offset < end)
 | 
				
			||||||
		btrfs_free_reserved_data_space(inode, cur_offset,
 | 
							btrfs_free_reserved_data_space(inode, NULL, cur_offset,
 | 
				
			||||||
			end - cur_offset + 1);
 | 
								end - cur_offset + 1);
 | 
				
			||||||
	return ret;
 | 
						return ret;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1227,7 +1227,7 @@ static int cluster_pages_for_defrag(struct inode *inode,
 | 
				
			||||||
		spin_lock(&BTRFS_I(inode)->lock);
 | 
							spin_lock(&BTRFS_I(inode)->lock);
 | 
				
			||||||
		BTRFS_I(inode)->outstanding_extents++;
 | 
							BTRFS_I(inode)->outstanding_extents++;
 | 
				
			||||||
		spin_unlock(&BTRFS_I(inode)->lock);
 | 
							spin_unlock(&BTRFS_I(inode)->lock);
 | 
				
			||||||
		btrfs_delalloc_release_space(inode,
 | 
							btrfs_delalloc_release_space(inode, data_reserved,
 | 
				
			||||||
				start_index << PAGE_SHIFT,
 | 
									start_index << PAGE_SHIFT,
 | 
				
			||||||
				(page_cnt - i_done) << PAGE_SHIFT);
 | 
									(page_cnt - i_done) << PAGE_SHIFT);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
| 
						 | 
					@ -1255,7 +1255,7 @@ static int cluster_pages_for_defrag(struct inode *inode,
 | 
				
			||||||
		unlock_page(pages[i]);
 | 
							unlock_page(pages[i]);
 | 
				
			||||||
		put_page(pages[i]);
 | 
							put_page(pages[i]);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	btrfs_delalloc_release_space(inode,
 | 
						btrfs_delalloc_release_space(inode, data_reserved,
 | 
				
			||||||
			start_index << PAGE_SHIFT,
 | 
								start_index << PAGE_SHIFT,
 | 
				
			||||||
			page_cnt << PAGE_SHIFT);
 | 
								page_cnt << PAGE_SHIFT);
 | 
				
			||||||
	extent_changeset_free(data_reserved);
 | 
						extent_changeset_free(data_reserved);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2892,13 +2892,72 @@ int btrfs_qgroup_reserve_data(struct inode *inode,
 | 
				
			||||||
	return ret;
 | 
						return ret;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int __btrfs_qgroup_release_data(struct inode *inode, u64 start, u64 len,
 | 
					/* Free ranges specified by @reserved, normally in error path */
 | 
				
			||||||
				       int free)
 | 
					static int qgroup_free_reserved_data(struct inode *inode,
 | 
				
			||||||
 | 
								struct extent_changeset *reserved, u64 start, u64 len)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						struct btrfs_root *root = BTRFS_I(inode)->root;
 | 
				
			||||||
 | 
						struct ulist_node *unode;
 | 
				
			||||||
 | 
						struct ulist_iterator uiter;
 | 
				
			||||||
 | 
						struct extent_changeset changeset;
 | 
				
			||||||
 | 
						int freed = 0;
 | 
				
			||||||
 | 
						int ret;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						extent_changeset_init(&changeset);
 | 
				
			||||||
 | 
						len = round_up(start + len, root->fs_info->sectorsize);
 | 
				
			||||||
 | 
						start = round_down(start, root->fs_info->sectorsize);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						ULIST_ITER_INIT(&uiter);
 | 
				
			||||||
 | 
						while ((unode = ulist_next(&reserved->range_changed, &uiter))) {
 | 
				
			||||||
 | 
							u64 range_start = unode->val;
 | 
				
			||||||
 | 
							/* unode->aux is the inclusive end */
 | 
				
			||||||
 | 
							u64 range_len = unode->aux - range_start + 1;
 | 
				
			||||||
 | 
							u64 free_start;
 | 
				
			||||||
 | 
							u64 free_len;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							extent_changeset_release(&changeset);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							/* Only free range in range [start, start + len) */
 | 
				
			||||||
 | 
							if (range_start >= start + len ||
 | 
				
			||||||
 | 
							    range_start + range_len <= start)
 | 
				
			||||||
 | 
								continue;
 | 
				
			||||||
 | 
							free_start = max(range_start, start);
 | 
				
			||||||
 | 
							free_len = min(start + len, range_start + range_len) -
 | 
				
			||||||
 | 
								   free_start;
 | 
				
			||||||
 | 
							/*
 | 
				
			||||||
 | 
							 * TODO: To also modify reserved->ranges_reserved to reflect
 | 
				
			||||||
 | 
							 * the modification.
 | 
				
			||||||
 | 
							 *
 | 
				
			||||||
 | 
							 * However as long as we free qgroup reserved according to
 | 
				
			||||||
 | 
							 * EXTENT_QGROUP_RESERVED, we won't double free.
 | 
				
			||||||
 | 
							 * So not need to rush.
 | 
				
			||||||
 | 
							 */
 | 
				
			||||||
 | 
							ret = clear_record_extent_bits(&BTRFS_I(inode)->io_failure_tree,
 | 
				
			||||||
 | 
									free_start, free_start + free_len - 1,
 | 
				
			||||||
 | 
									EXTENT_QGROUP_RESERVED, &changeset);
 | 
				
			||||||
 | 
							if (ret < 0)
 | 
				
			||||||
 | 
								goto out;
 | 
				
			||||||
 | 
							freed += changeset.bytes_changed;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						btrfs_qgroup_free_refroot(root->fs_info, root->objectid, freed);
 | 
				
			||||||
 | 
						ret = freed;
 | 
				
			||||||
 | 
					out:
 | 
				
			||||||
 | 
						extent_changeset_release(&changeset);
 | 
				
			||||||
 | 
						return ret;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static int __btrfs_qgroup_release_data(struct inode *inode,
 | 
				
			||||||
 | 
								struct extent_changeset *reserved, u64 start, u64 len,
 | 
				
			||||||
 | 
								int free)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct extent_changeset changeset;
 | 
						struct extent_changeset changeset;
 | 
				
			||||||
	int trace_op = QGROUP_RELEASE;
 | 
						int trace_op = QGROUP_RELEASE;
 | 
				
			||||||
	int ret;
 | 
						int ret;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						/* In release case, we shouldn't have @reserved */
 | 
				
			||||||
 | 
						WARN_ON(!free && reserved);
 | 
				
			||||||
 | 
						if (free && reserved)
 | 
				
			||||||
 | 
							return qgroup_free_reserved_data(inode, reserved, start, len);
 | 
				
			||||||
	extent_changeset_init(&changeset);
 | 
						extent_changeset_init(&changeset);
 | 
				
			||||||
	ret = clear_record_extent_bits(&BTRFS_I(inode)->io_tree, start, 
 | 
						ret = clear_record_extent_bits(&BTRFS_I(inode)->io_tree, start, 
 | 
				
			||||||
			start + len -1, EXTENT_QGROUP_RESERVED, &changeset);
 | 
								start + len -1, EXTENT_QGROUP_RESERVED, &changeset);
 | 
				
			||||||
| 
						 | 
					@ -2924,14 +2983,17 @@ static int __btrfs_qgroup_release_data(struct inode *inode, u64 start, u64 len,
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * Should be called when a range of pages get invalidated before reaching disk.
 | 
					 * Should be called when a range of pages get invalidated before reaching disk.
 | 
				
			||||||
 * Or for error cleanup case.
 | 
					 * Or for error cleanup case.
 | 
				
			||||||
 | 
					 * if @reserved is given, only reserved range in [@start, @start + @len) will
 | 
				
			||||||
 | 
					 * be freed.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * For data written to disk, use btrfs_qgroup_release_data().
 | 
					 * For data written to disk, use btrfs_qgroup_release_data().
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * NOTE: This function may sleep for memory allocation.
 | 
					 * NOTE: This function may sleep for memory allocation.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
int btrfs_qgroup_free_data(struct inode *inode, u64 start, u64 len)
 | 
					int btrfs_qgroup_free_data(struct inode *inode,
 | 
				
			||||||
 | 
								struct extent_changeset *reserved, u64 start, u64 len)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	return __btrfs_qgroup_release_data(inode, start, len, 1);
 | 
						return __btrfs_qgroup_release_data(inode, reserved, start, len, 1);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
| 
						 | 
					@ -2951,7 +3013,7 @@ int btrfs_qgroup_free_data(struct inode *inode, u64 start, u64 len)
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
int btrfs_qgroup_release_data(struct inode *inode, u64 start, u64 len)
 | 
					int btrfs_qgroup_release_data(struct inode *inode, u64 start, u64 len)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	return __btrfs_qgroup_release_data(inode, start, len, 0);
 | 
						return __btrfs_qgroup_release_data(inode, NULL, start, len, 0);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes,
 | 
					int btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -245,7 +245,8 @@ int btrfs_verify_qgroup_counts(struct btrfs_fs_info *fs_info, u64 qgroupid,
 | 
				
			||||||
int btrfs_qgroup_reserve_data(struct inode *inode,
 | 
					int btrfs_qgroup_reserve_data(struct inode *inode,
 | 
				
			||||||
			struct extent_changeset **reserved, u64 start, u64 len);
 | 
								struct extent_changeset **reserved, u64 start, u64 len);
 | 
				
			||||||
int btrfs_qgroup_release_data(struct inode *inode, u64 start, u64 len);
 | 
					int btrfs_qgroup_release_data(struct inode *inode, u64 start, u64 len);
 | 
				
			||||||
int btrfs_qgroup_free_data(struct inode *inode, u64 start, u64 len);
 | 
					int btrfs_qgroup_free_data(struct inode *inode,
 | 
				
			||||||
 | 
								struct extent_changeset *reserved, u64 start, u64 len);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes,
 | 
					int btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes,
 | 
				
			||||||
			      bool enforce);
 | 
								      bool enforce);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3114,8 +3114,8 @@ int prealloc_file_extent_cluster(struct inode *inode,
 | 
				
			||||||
		lock_extent(&BTRFS_I(inode)->io_tree, start, end);
 | 
							lock_extent(&BTRFS_I(inode)->io_tree, start, end);
 | 
				
			||||||
		num_bytes = end + 1 - start;
 | 
							num_bytes = end + 1 - start;
 | 
				
			||||||
		if (cur_offset < start)
 | 
							if (cur_offset < start)
 | 
				
			||||||
			btrfs_free_reserved_data_space(inode, cur_offset,
 | 
								btrfs_free_reserved_data_space(inode, data_reserved,
 | 
				
			||||||
					start - cur_offset);
 | 
										cur_offset, start - cur_offset);
 | 
				
			||||||
		ret = btrfs_prealloc_file_range(inode, 0, start,
 | 
							ret = btrfs_prealloc_file_range(inode, 0, start,
 | 
				
			||||||
						num_bytes, num_bytes,
 | 
											num_bytes, num_bytes,
 | 
				
			||||||
						end + 1, &alloc_hint);
 | 
											end + 1, &alloc_hint);
 | 
				
			||||||
| 
						 | 
					@ -3126,8 +3126,8 @@ int prealloc_file_extent_cluster(struct inode *inode,
 | 
				
			||||||
		nr++;
 | 
							nr++;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	if (cur_offset < prealloc_end)
 | 
						if (cur_offset < prealloc_end)
 | 
				
			||||||
		btrfs_free_reserved_data_space(inode, cur_offset,
 | 
							btrfs_free_reserved_data_space(inode, data_reserved,
 | 
				
			||||||
				       prealloc_end + 1 - cur_offset);
 | 
									cur_offset, prealloc_end + 1 - cur_offset);
 | 
				
			||||||
out:
 | 
					out:
 | 
				
			||||||
	inode_unlock(inode);
 | 
						inode_unlock(inode);
 | 
				
			||||||
	extent_changeset_free(data_reserved);
 | 
						extent_changeset_free(data_reserved);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue