[PATCHv4,1/3] btrfs: remove unneeded variable "ret" in btrfs_destroy_delayed_refs

Commit Message

zhong jiang Aug. 16, 2018, 4:37 p.m. UTC

btrfs_destroy_delayed_refs defines the variable "ret" for return value,
but it is not modified after initialization. So it is safe to drop the
unneeded value "ret".

Signed-off-by: zhong jiang <[e-mail]>
---
 fs/btrfs/disk-io.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

David Sterba Aug. 22, 2018, 3:45 p.m. UTC | #1

On Fri, Aug 17, 2018 at 12:37:13AM +0800, zhong jiang wrote:
> btrfs_destroy_delayed_refs defines the variable "ret" for return value,
> but it is not modified after initialization. So it is safe to drop the
> unneeded value "ret".

No it's not, please read my previous reply again.

Patch

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 5124c15..6cdc23a 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -4192,7 +4192,6 @@  static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
 	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 0;
 	}
 
 	while ((node = rb_first(&delayed_refs->href_root)) != NULL) {
@@ -4255,7 +4254,7 @@  static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
 
 	spin_unlock(&delayed_refs->lock);
 
-	return ret;
+	return 0;
 }
 
 static void btrfs_destroy_delalloc_inodes(struct btrfs_root *root)