From: zhong jiang <zhongjiang@huawei.com>
To: <clm@fb.com>, <jbacik@fb.com>, <dsterba@suse.com>
Cc: <linux-btrfs@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCHv3 2/3] fs/btrfs/extent-tree: change btrfs_free_reserved_bytes to be void funtion
Date: Wed, 8 Aug 2018 21:47:54 +0800 [thread overview]
Message-ID: <1533736075-8691-3-git-send-email-zhongjiang@huawei.com> (raw)
In-Reply-To: <1533736075-8691-1-git-send-email-zhongjiang@huawei.com>
btrfs_free_reserved_bytes defines the variable "ret" for return value,
but it is not modified after initialzation. Further, I find that any of
the callees do not handle the return value, so it is safe to drop the
unneeded value "ret".
Signed-off-by: zhong jiang <zhongjiang@huawei.com>
---
fs/btrfs/extent-tree.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index f77226d..ff305f5 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -6464,11 +6464,10 @@ static int btrfs_add_reserved_bytes(struct btrfs_block_group_cache *cache,
* reserve set to 0 in order to clear the reservation.
*/
-static int btrfs_free_reserved_bytes(struct btrfs_block_group_cache *cache,
- u64 num_bytes, int delalloc)
+static void btrfs_free_reserved_bytes(struct btrfs_block_group_cache *cache,
+ u64 num_bytes, int delalloc)
{
struct btrfs_space_info *space_info = cache->space_info;
- int ret = 0;
spin_lock(&space_info->lock);
spin_lock(&cache->lock);
@@ -6481,7 +6480,6 @@ static int btrfs_free_reserved_bytes(struct btrfs_block_group_cache *cache,
cache->delalloc_bytes -= num_bytes;
spin_unlock(&cache->lock);
spin_unlock(&space_info->lock);
- return ret;
}
void btrfs_prepare_extent_commit(struct btrfs_fs_info *fs_info)
{
--
1.7.12.4
next prev parent reply other threads:[~2018-08-08 13:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-08 13:47 [PATCHv3 0/3] change some function to be void function zhong jiang
2018-08-08 13:47 ` [PATCHv3 1/3] fs/btrfs/disk-io: change btrfs_destroy_delayed_refs " zhong jiang
2018-08-15 12:44 ` David Sterba
2018-08-08 13:47 ` zhong jiang [this message]
2018-08-08 13:47 ` [PATCHv3 3/3] fs/btrfs/tree-log: change btrfs_pin_log_trans " zhong jiang
2018-08-15 12:53 ` [PATCHv3 0/3] change some function " David Sterba
2018-08-15 13:06 ` zhong jiang
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=1533736075-8691-3-git-send-email-zhongjiang@huawei.com \
--to=zhongjiang@huawei.com \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=jbacik@fb.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@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).