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>

diff --git a/fs/btrfs/block-rsv.c b/fs/btrfs/block-rsv.c
index 75cd35570a287b06fa4701479f5469c16f304c32..96cf7a1629870f11d2cf320db4832b16d4fc9274 100644 (file)
--- a/fs/btrfs/block-rsv.c
+++ b/fs/btrfs/block-rsv.c
@@ -218,8 +218,7 @@ int btrfs_block_rsv_add(struct btrfs_fs_info *fs_info,
        if (num_bytes == 0)
                return 0;
 
-       ret = btrfs_reserve_metadata_bytes(fs_info, block_rsv->space_info,
-                                          num_bytes, flush);
+       ret = btrfs_reserve_metadata_bytes(block_rsv->space_info, num_bytes, flush);
        if (!ret)
                btrfs_block_rsv_add_bytes(block_rsv, num_bytes, true);
 
@@ -259,8 +258,7 @@ int btrfs_block_rsv_refill(struct btrfs_fs_info *fs_info,
        if (!ret)
                return 0;
 
-       ret = btrfs_reserve_metadata_bytes(fs_info, block_rsv->space_info,
-                                          num_bytes, flush);
+       ret = btrfs_reserve_metadata_bytes(block_rsv->space_info, num_bytes, flush);
        if (!ret) {
                btrfs_block_rsv_add_bytes(block_rsv, num_bytes, false);
                return 0;
@@ -530,8 +528,8 @@ again:
                                block_rsv->type, ret);
        }
 try_reserve:
-       ret = btrfs_reserve_metadata_bytes(fs_info, block_rsv->space_info,
-                                          blocksize, BTRFS_RESERVE_NO_FLUSH);
+       ret = btrfs_reserve_metadata_bytes(block_rsv->space_info, blocksize,
+                                          BTRFS_RESERVE_NO_FLUSH);
        if (!ret)
                return block_rsv;
        /*
@@ -552,7 +550,7 @@ try_reserve:
         * one last time to force a reservation if there's enough actual space
         * on disk to make the reservation.
         */
-       ret = btrfs_reserve_metadata_bytes(fs_info, block_rsv->space_info, blocksize,
+       ret = btrfs_reserve_metadata_bytes(block_rsv->space_info, blocksize,
                                           BTRFS_RESERVE_FLUSH_EMERGENCY);
        if (!ret)
                return block_rsv;

diff --git a/fs/btrfs/delalloc-space.c b/fs/btrfs/delalloc-space.c
index 288e1776c02da3f14aed1e105e0a28bbbaadfa16..0970799d0aa443a3688ad58f08e3766be05716d8 100644 (file)
--- a/fs/btrfs/delalloc-space.c
+++ b/fs/btrfs/delalloc-space.c
@@ -358,8 +358,8 @@ int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes,
                                                 noflush);
        if (ret)
                return ret;
-       ret = btrfs_reserve_metadata_bytes(fs_info, block_rsv->space_info,
-                                          meta_reserve, flush);
+       ret = btrfs_reserve_metadata_bytes(block_rsv->space_info, meta_reserve,
+                                          flush);
        if (ret) {
                btrfs_qgroup_free_meta_prealloc(root, qgroup_reserve);
                return ret;

diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index f8fc26272f76c5b098e2c53f9587bb32b8f2a87d..e8bc374533367656d4ae3a4354f671274c3145e5 100644 (file)
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -228,7 +228,7 @@ int btrfs_delayed_refs_rsv_refill(struct btrfs_fs_info *fs_info,
        if (!num_bytes)
                return 0;
 
-       ret = btrfs_reserve_metadata_bytes(fs_info, space_info, num_bytes, flush);
+       ret = btrfs_reserve_metadata_bytes(space_info, num_bytes, flush);
        if (ret)
                return ret;
 

diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
index 30f1c2d23fc6a3331e262b4dbb34ee580f78f16e..9ced89678953347ea77c79ea4c83701600f2f97a 100644 (file)
--- a/fs/btrfs/space-info.c
+++ b/fs/btrfs/space-info.c
@@ -1848,7 +1848,6 @@ static int __reserve_bytes(struct btrfs_space_info *space_info, u64 orig_bytes,
 /*
  * Try to reserve metadata bytes from the block_rsv's space.
  *
- * @fs_info:    the filesystem
  * @space_info: the space_info we're allocating for
  * @orig_bytes: number of bytes we want
  * @flush:      whether or not we can flush to make our reservation
@@ -1860,8 +1859,7 @@ static int __reserve_bytes(struct btrfs_space_info *space_info, u64 orig_bytes,
  * regain reservations will be made and this will fail if there is not enough
  * space already.
  */
-int btrfs_reserve_metadata_bytes(struct btrfs_fs_info *fs_info,
-                                struct btrfs_space_info *space_info,
+int btrfs_reserve_metadata_bytes(struct btrfs_space_info *space_info,
                                 u64 orig_bytes,
                                 enum btrfs_reserve_flush_enum flush)
 {
@@ -1869,6 +1867,8 @@ int btrfs_reserve_metadata_bytes(struct btrfs_fs_info *fs_info,
 
        ret = __reserve_bytes(space_info, orig_bytes, flush);
        if (ret == -ENOSPC) {
+               struct btrfs_fs_info *fs_info = space_info->fs_info;
+
                trace_btrfs_space_reservation(fs_info, "space_info:enospc",
                                              space_info->flags, orig_bytes, 1);
 

diff --git a/fs/btrfs/space-info.h b/fs/btrfs/space-info.h
index a88cf71b3d3a872fb4bdba6c49d91b854ebf42d5..2fad2e4c22524247a5d5a16bad320e2adbcc8db0 100644 (file)
--- a/fs/btrfs/space-info.h
+++ b/fs/btrfs/space-info.h
@@ -278,8 +278,7 @@ u64 __pure btrfs_space_info_used(const struct btrfs_space_info *s_info,
 void btrfs_clear_space_info_full(struct btrfs_fs_info *info);
 void btrfs_dump_space_info(struct btrfs_space_info *info, u64 bytes,
                           bool dump_block_groups);
-int btrfs_reserve_metadata_bytes(struct btrfs_fs_info *fs_info,
-                                struct btrfs_space_info *space_info,
+int btrfs_reserve_metadata_bytes(struct btrfs_space_info *space_info,
                                 u64 orig_bytes,
                                 enum btrfs_reserve_flush_enum flush);
 void btrfs_try_granting_tickets(struct btrfs_space_info *space_info);

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 89ae0c7a610aa5368722ae2d42e4b1c154e38033..6607e354eae532a151a0bf615805fd4a84bb1250 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -575,7 +575,7 @@ static int btrfs_reserve_trans_metadata(struct btrfs_fs_info *fs_info,
         * We want to reserve all the bytes we may need all at once, so we only
         * do 1 enospc flushing cycle per transaction start.
         */
-       ret = btrfs_reserve_metadata_bytes(fs_info, si, bytes, flush);
+       ret = btrfs_reserve_metadata_bytes(si, bytes, flush);
 
        /*
         * If we are an emergency flush, which can steal from the global block
@@ -585,7 +585,7 @@ static int btrfs_reserve_trans_metadata(struct btrfs_fs_info *fs_info,
        if (ret && flush == BTRFS_RESERVE_FLUSH_ALL_STEAL) {
                bytes -= *delayed_refs_bytes;
                *delayed_refs_bytes = 0;
-               ret = btrfs_reserve_metadata_bytes(fs_info, si, bytes, flush);
+               ret = btrfs_reserve_metadata_bytes(si, bytes, flush);
        }
 
        return ret;