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 1/3] fs/btrfs/disk-io: change btrfs_destroy_delayed_refs to be void function
Date: Wed, 8 Aug 2018 21:47:53 +0800 [thread overview]
Message-ID: <1533736075-8691-2-git-send-email-zhongjiang@huawei.com> (raw)
In-Reply-To: <1533736075-8691-1-git-send-email-zhongjiang@huawei.com>
btrfs_destroy_delayed_refs defines the variable "ret" for return value, but
it is not modified after initialization. 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/disk-io.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 5124c15..f972fdd 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -53,8 +53,8 @@
static const struct extent_io_ops btree_extent_io_ops;
static void end_workqueue_fn(struct btrfs_work *work);
static void btrfs_destroy_ordered_extents(struct btrfs_root *root);
-static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
- struct btrfs_fs_info *fs_info);
+static void btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
+ struct btrfs_fs_info *fs_info);
static void btrfs_destroy_delalloc_inodes(struct btrfs_root *root);
static int btrfs_destroy_marked_extents(struct btrfs_fs_info *fs_info,
struct extent_io_tree *dirty_pages,
@@ -4186,13 +4186,12 @@ static void btrfs_destroy_all_ordered_extents(struct btrfs_fs_info *fs_info)
spin_unlock(&fs_info->ordered_root_lock);
}
-static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
- struct btrfs_fs_info *fs_info)
+static void btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
+ struct btrfs_fs_info *fs_info)
{
struct rb_node *node;
struct btrfs_delayed_ref_root *delayed_refs;
struct btrfs_delayed_ref_node *ref;
- int ret = 0;
delayed_refs = &trans->delayed_refs;
@@ -4200,7 +4199,7 @@ static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
if (atomic_read(&delayed_refs->num_entries) == 0) {
spin_unlock(&delayed_refs->lock);
btrfs_info(fs_info, "delayed_refs has NO entry");
- return ret;
+ return;
}
while ((node = rb_first(&delayed_refs->href_root)) != NULL) {
@@ -4254,8 +4253,6 @@ static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
}
spin_unlock(&delayed_refs->lock);
-
- return ret;
}
static void btrfs_destroy_delalloc_inodes(struct btrfs_root *root)
--
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 ` zhong jiang [this message]
2018-08-15 12:44 ` [PATCHv3 1/3] fs/btrfs/disk-io: change btrfs_destroy_delayed_refs " David Sterba
2018-08-08 13:47 ` [PATCHv3 2/3] fs/btrfs/extent-tree: change btrfs_free_reserved_bytes to be void funtion zhong jiang
2018-08-08 13:47 ` [PATCHv3 3/3] fs/btrfs/tree-log: change btrfs_pin_log_trans to be void function 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-2-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).