Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

btrfs: remove fs_info argument from btrfs_reserve_metadata_bytes()

We don't need it since we can grab fs_info from the given space_info.
So remove the fs_info argument.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Anand Jain <asj@kernel.org>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

authored by

Filipe Manana and committed by
David Sterba
a1359d06 30b87a23

+14 -17
+5 -7
fs/btrfs/block-rsv.c
··· 218 218 if (num_bytes == 0) 219 219 return 0; 220 220 221 - ret = btrfs_reserve_metadata_bytes(fs_info, block_rsv->space_info, 222 - num_bytes, flush); 221 + ret = btrfs_reserve_metadata_bytes(block_rsv->space_info, num_bytes, flush); 223 222 if (!ret) 224 223 btrfs_block_rsv_add_bytes(block_rsv, num_bytes, true); 225 224 ··· 258 259 if (!ret) 259 260 return 0; 260 261 261 - ret = btrfs_reserve_metadata_bytes(fs_info, block_rsv->space_info, 262 - num_bytes, flush); 262 + ret = btrfs_reserve_metadata_bytes(block_rsv->space_info, num_bytes, flush); 263 263 if (!ret) { 264 264 btrfs_block_rsv_add_bytes(block_rsv, num_bytes, false); 265 265 return 0; ··· 528 530 block_rsv->type, ret); 529 531 } 530 532 try_reserve: 531 - ret = btrfs_reserve_metadata_bytes(fs_info, block_rsv->space_info, 532 - blocksize, BTRFS_RESERVE_NO_FLUSH); 533 + ret = btrfs_reserve_metadata_bytes(block_rsv->space_info, blocksize, 534 + BTRFS_RESERVE_NO_FLUSH); 533 535 if (!ret) 534 536 return block_rsv; 535 537 /* ··· 550 552 * one last time to force a reservation if there's enough actual space 551 553 * on disk to make the reservation. 552 554 */ 553 - ret = btrfs_reserve_metadata_bytes(fs_info, block_rsv->space_info, blocksize, 555 + ret = btrfs_reserve_metadata_bytes(block_rsv->space_info, blocksize, 554 556 BTRFS_RESERVE_FLUSH_EMERGENCY); 555 557 if (!ret) 556 558 return block_rsv;
+2 -2
fs/btrfs/delalloc-space.c
··· 358 358 noflush); 359 359 if (ret) 360 360 return ret; 361 - ret = btrfs_reserve_metadata_bytes(fs_info, block_rsv->space_info, 362 - meta_reserve, flush); 361 + ret = btrfs_reserve_metadata_bytes(block_rsv->space_info, meta_reserve, 362 + flush); 363 363 if (ret) { 364 364 btrfs_qgroup_free_meta_prealloc(root, qgroup_reserve); 365 365 return ret;
+1 -1
fs/btrfs/delayed-ref.c
··· 228 228 if (!num_bytes) 229 229 return 0; 230 230 231 - ret = btrfs_reserve_metadata_bytes(fs_info, space_info, num_bytes, flush); 231 + ret = btrfs_reserve_metadata_bytes(space_info, num_bytes, flush); 232 232 if (ret) 233 233 return ret; 234 234
+3 -3
fs/btrfs/space-info.c
··· 1848 1848 /* 1849 1849 * Try to reserve metadata bytes from the block_rsv's space. 1850 1850 * 1851 - * @fs_info: the filesystem 1852 1851 * @space_info: the space_info we're allocating for 1853 1852 * @orig_bytes: number of bytes we want 1854 1853 * @flush: whether or not we can flush to make our reservation ··· 1859 1860 * regain reservations will be made and this will fail if there is not enough 1860 1861 * space already. 1861 1862 */ 1862 - int btrfs_reserve_metadata_bytes(struct btrfs_fs_info *fs_info, 1863 - struct btrfs_space_info *space_info, 1863 + int btrfs_reserve_metadata_bytes(struct btrfs_space_info *space_info, 1864 1864 u64 orig_bytes, 1865 1865 enum btrfs_reserve_flush_enum flush) 1866 1866 { ··· 1867 1869 1868 1870 ret = __reserve_bytes(space_info, orig_bytes, flush); 1869 1871 if (ret == -ENOSPC) { 1872 + struct btrfs_fs_info *fs_info = space_info->fs_info; 1873 + 1870 1874 trace_btrfs_space_reservation(fs_info, "space_info:enospc", 1871 1875 space_info->flags, orig_bytes, 1); 1872 1876
+1 -2
fs/btrfs/space-info.h
··· 278 278 void btrfs_clear_space_info_full(struct btrfs_fs_info *info); 279 279 void btrfs_dump_space_info(struct btrfs_space_info *info, u64 bytes, 280 280 bool dump_block_groups); 281 - int btrfs_reserve_metadata_bytes(struct btrfs_fs_info *fs_info, 282 - struct btrfs_space_info *space_info, 281 + int btrfs_reserve_metadata_bytes(struct btrfs_space_info *space_info, 283 282 u64 orig_bytes, 284 283 enum btrfs_reserve_flush_enum flush); 285 284 void btrfs_try_granting_tickets(struct btrfs_space_info *space_info);
+2 -2
fs/btrfs/transaction.c
··· 575 575 * We want to reserve all the bytes we may need all at once, so we only 576 576 * do 1 enospc flushing cycle per transaction start. 577 577 */ 578 - ret = btrfs_reserve_metadata_bytes(fs_info, si, bytes, flush); 578 + ret = btrfs_reserve_metadata_bytes(si, bytes, flush); 579 579 580 580 /* 581 581 * If we are an emergency flush, which can steal from the global block ··· 585 585 if (ret && flush == BTRFS_RESERVE_FLUSH_ALL_STEAL) { 586 586 bytes -= *delayed_refs_bytes; 587 587 *delayed_refs_bytes = 0; 588 - ret = btrfs_reserve_metadata_bytes(fs_info, si, bytes, flush); 588 + ret = btrfs_reserve_metadata_bytes(si, bytes, flush); 589 589 } 590 590 591 591 return ret;