linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nikolay Borisov <nborisov@suse.com>
To: dsterba@suse.cz
Cc: linux-btrfs@vger.kernel.org, Nikolay Borisov <nborisov@suse.com>
Subject: [PATCH 02/10] btrfs: remove superfluous chunk_tree argument from btrfs_alloc_dev_extent
Date: Mon, 21 Aug 2017 12:43:42 +0300	[thread overview]
Message-ID: <1503308630-6652-3-git-send-email-nborisov@suse.com> (raw)
In-Reply-To: <1503308630-6652-1-git-send-email-nborisov@suse.com>

Currently this function is always called with the object id of the root key of
the chunk_tree, which is always BTRFS_CHUNK_TREE_OBJECTID. So let's subsume it
straight into the function itself. No functional change.

Signed-off-by: Nikolay Borisov <nborisov@suse.com>
---
 fs/btrfs/volumes.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 63608c5f4487..d024f1b07282 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1571,8 +1571,7 @@ static int btrfs_free_dev_extent(struct btrfs_trans_handle *trans,
 
 static int btrfs_alloc_dev_extent(struct btrfs_trans_handle *trans,
 				  struct btrfs_device *device,
-				  u64 chunk_tree, u64 chunk_offset, u64 start,
-				  u64 num_bytes)
+				  u64 chunk_offset, u64 start, u64 num_bytes)
 {
 	int ret;
 	struct btrfs_path *path;
@@ -1599,7 +1598,8 @@ static int btrfs_alloc_dev_extent(struct btrfs_trans_handle *trans,
 	leaf = path->nodes[0];
 	extent = btrfs_item_ptr(leaf, path->slots[0],
 				struct btrfs_dev_extent);
-	btrfs_set_dev_extent_chunk_tree(leaf, extent, chunk_tree);
+	btrfs_set_dev_extent_chunk_tree(leaf, extent,
+					BTRFS_CHUNK_TREE_OBJECTID);
 	btrfs_set_dev_extent_chunk_objectid(leaf, extent,
 					    BTRFS_FIRST_CHUNK_TREE_OBJECTID);
 	btrfs_set_dev_extent_chunk_offset(leaf, extent, chunk_offset);
@@ -4903,10 +4903,8 @@ int btrfs_finish_chunk_alloc(struct btrfs_trans_handle *trans,
 		ret = btrfs_update_device(trans, device);
 		if (ret)
 			break;
-		ret = btrfs_alloc_dev_extent(trans, device,
-					     chunk_root->root_key.objectid,
-					     chunk_offset, dev_offset,
-					     stripe_size);
+		ret = btrfs_alloc_dev_extent(trans, device, chunk_offset,
+					     dev_offset, stripe_size);
 		if (ret)
 			break;
 	}
-- 
2.7.4


  parent reply	other threads:[~2017-08-21  9:43 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-21  9:43 [PATCH 00/10] Unused parameter cleanup Nikolay Borisov
2017-08-21  9:43 ` [PATCH 01/10] btrfs: Remove chunk_objectid parameter of btrfs_alloc_dev_extent Nikolay Borisov
2017-08-21 13:02   ` Timofey Titovets
2017-08-21  9:43 ` Nikolay Borisov [this message]
2017-08-21  9:43 ` [PATCH 03/10] btrfs: Remove unused variable Nikolay Borisov
2017-08-21 13:06   ` Timofey Titovets
2017-08-21  9:43 ` [PATCH 04/10] btrfs: Remove unused parameters from various functions Nikolay Borisov
2017-08-21  9:43 ` [PATCH 05/10] btrfs: Remove unused arguments from btrfs_changed_cb_t Nikolay Borisov
2017-08-21  9:43 ` [PATCH 06/10] btrfs: Remove unused parameter from check_direct_IO Nikolay Borisov
2017-08-21 12:25   ` Timofey Titovets
2017-09-07 19:09   ` David Sterba
2017-08-21  9:43 ` [PATCH 07/10] btrfs: Remove unused parameter from extent_clear_unlock_delalloc Nikolay Borisov
2017-09-07 19:20   ` David Sterba
2017-08-21  9:43 ` [PATCH 08/10] btrfs: remove unused parameter in cow_file_range Nikolay Borisov
2017-09-25 12:18   ` Nikolay Borisov
2017-09-25 13:22     ` Qu Wenruo
2017-09-25 13:29     ` David Sterba
2017-08-21  9:43 ` [PATCH 09/10] btrfs: Rework error handling of add_extent_mapping in __btrfs_alloc_chunk Nikolay Borisov
2017-09-07 19:26   ` David Sterba
2017-08-21  9:43 ` [PATCH 10/10] btrfs: Remove redundant argument of __link_block_group Nikolay Borisov
2017-09-07 19:33   ` David Sterba
2017-08-21 17:36 ` [PATCH 00/10] Unused parameter cleanup Josef Bacik
2017-09-07 19:39 ` David Sterba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1503308630-6652-3-git-send-email-nborisov@suse.com \
    --to=nborisov@suse.com \
    --cc=dsterba@suse.cz \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).