All of lore.kernel.org
 help / color / mirror / Atom feed
From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: Anand Jain <anand.jain@oracle.com>
Subject: [PATCH 23/29] btrfs: lookup_extent_data_ref rename ret to ret2 and err to ret
Date: Tue, 19 Mar 2024 20:25:31 +0530	[thread overview]
Message-ID: <3dacbcffa8d7c4e70e934b8b977676a1072878f4.1710857863.git.anand.jain@oracle.com> (raw)
In-Reply-To: <cover.1710857863.git.anand.jain@oracle.com>

First, rename ret to ret2, compile, and then rename err to 'ret',
to ensure that no original ret remains as the new ret.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
 fs/btrfs/extent-tree.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 1a1191efe59e..4b0a55e66a55 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -448,9 +448,9 @@ static noinline int lookup_extent_data_ref(struct btrfs_trans_handle *trans,
 	struct btrfs_extent_data_ref *ref;
 	struct extent_buffer *leaf;
 	u32 nritems;
-	int ret;
+	int ret2;
 	int recow;
-	int err = -ENOENT;
+	int ret = -ENOENT;
 
 	key.objectid = bytenr;
 	if (parent) {
@@ -463,14 +463,14 @@ static noinline int lookup_extent_data_ref(struct btrfs_trans_handle *trans,
 	}
 again:
 	recow = 0;
-	ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
-	if (ret < 0) {
-		err = ret;
+	ret2 = btrfs_search_slot(trans, root, &key, path, -1, 1);
+	if (ret2 < 0) {
+		ret = ret2;
 		goto fail;
 	}
 
 	if (parent) {
-		if (!ret)
+		if (!ret2)
 			return 0;
 		goto fail;
 	}
@@ -479,10 +479,10 @@ static noinline int lookup_extent_data_ref(struct btrfs_trans_handle *trans,
 	nritems = btrfs_header_nritems(leaf);
 	while (1) {
 		if (path->slots[0] >= nritems) {
-			ret = btrfs_next_leaf(root, path);
-			if (ret < 0)
-				err = ret;
-			if (ret)
+			ret2 = btrfs_next_leaf(root, path);
+			if (ret2 < 0)
+				ret = ret2;
+			if (ret2)
 				goto fail;
 
 			leaf = path->nodes[0];
@@ -504,13 +504,13 @@ static noinline int lookup_extent_data_ref(struct btrfs_trans_handle *trans,
 				btrfs_release_path(path);
 				goto again;
 			}
-			err = 0;
+			ret = 0;
 			break;
 		}
 		path->slots[0]++;
 	}
 fail:
-	return err;
+	return ret;
 }
 
 static noinline int insert_extent_data_ref(struct btrfs_trans_handle *trans,
-- 
2.38.1


  parent reply	other threads:[~2024-03-19 14:58 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-19 14:55 [PATCH 00/29] trivial adjustments for return variable coding style Anand Jain
2024-03-19 14:55 ` [PATCH 01/29] btrfs: btrfs_cleanup_fs_roots rename ret to ret2 and err to ret Anand Jain
2024-03-19 17:38   ` Josef Bacik
2024-03-19 20:43   ` Qu Wenruo
2024-04-17  3:24     ` Anand Jain
2024-04-17  3:59       ` Qu Wenruo
2024-03-20 21:17   ` Goffredo Baroncelli
2024-03-19 14:55 ` [PATCH 02/29] btrfs: btrfs_initxattrs rename " Anand Jain
2024-03-19 14:55 ` [PATCH 03/29] btrfs: send_extent_data " Anand Jain
2024-03-20 12:59   ` Filipe Manana
2024-03-19 14:55 ` [PATCH 04/29] btrfs: btrfs_rmdir " Anand Jain
2024-03-19 14:55 ` [PATCH 05/29] btrfs: btrfs_cont_expand " Anand Jain
2024-03-19 14:55 ` [PATCH 06/29] btrfs: btrfs_setsize rename err to ret2 Anand Jain
2024-03-19 14:55 ` [PATCH 07/29] btrfs: btrfs_find_orphan_roots rename ret to ret2 and err to ret Anand Jain
2024-03-19 17:44   ` Josef Bacik
2024-03-19 21:09   ` Qu Wenruo
2024-03-19 14:55 ` [PATCH 08/29] btrfs: btrfs_ioctl_snap_destroy rename " Anand Jain
2024-03-19 14:55 ` [PATCH 09/29] btrfs: __set_extent_bit " Anand Jain
2024-03-19 14:55 ` [PATCH 10/29] btrfs: convert_extent_bit " Anand Jain
2024-03-19 14:55 ` [PATCH 11/29] btrfs: __btrfs_end_transaction " Anand Jain
2024-03-19 14:55 ` [PATCH 12/29] btrfs: btrfs_write_marked_extents rename werr to ret err to ret2 Anand Jain
2024-03-19 17:53   ` Josef Bacik
2024-04-16  2:39     ` Anand Jain
2024-03-19 21:25   ` Qu Wenruo
2024-04-16  3:18     ` Anand Jain
2024-03-19 14:55 ` [PATCH 13/29] btrfs: __btrfs_wait_marked_extents " Anand Jain
2024-03-19 17:54   ` Josef Bacik
2024-03-19 23:47   ` Qu Wenruo
2024-03-19 14:55 ` [PATCH 14/29] btrfs: build_backref_tree rename err to ret and ret " Anand Jain
2024-03-19 17:57   ` Josef Bacik
2024-03-19 14:55 ` [PATCH 15/29] btrfs: relocate_tree_blocks rename ret to ret2 and err to ret Anand Jain
2024-03-19 17:58   ` Josef Bacik
2024-03-19 14:55 ` [PATCH 16/29] btrfs: relocate_block_group " Anand Jain
2024-03-19 14:55 ` [PATCH 17/29] btrfs: create_reloc_inode rename " Anand Jain
2024-03-19 14:55 ` [PATCH 18/29] btrfs: btrfs_relocate_block_group rename ret to ret2 and err ro ret Anand Jain
2024-03-19 18:04   ` Josef Bacik
2024-03-19 14:55 ` [PATCH 19/29] btrfs: mark_garbage_root rename err to ret2 Anand Jain
2024-03-19 18:07   ` Josef Bacik
2024-03-22  2:29     ` David Sterba
2024-03-19 14:55 ` [PATCH 20/29] btrfs: btrfs_recover_relocation rename ret to ret2 and err to ret Anand Jain
2024-03-19 14:55 ` [PATCH 21/29] btrfs: quick_update_accounting rename err to ret2 Anand Jain
2024-03-19 18:10   ` Josef Bacik
2024-03-19 14:55 ` [PATCH 22/29] btrfs: btrfs_qgroup_rescan_worker rename ret to ret2 and err to ret Anand Jain
2024-03-19 14:55 ` Anand Jain [this message]
2024-03-19 18:17   ` [PATCH 23/29] btrfs: lookup_extent_data_ref " Josef Bacik
2024-04-18  6:55     ` Anand Jain
2024-03-19 14:55 ` [PATCH 24/29] btrfs: btrfs_drop_snapshot " Anand Jain
2024-03-19 18:20   ` Josef Bacik
2024-03-19 14:55 ` [PATCH 25/29] btrfs: btrfs_drop_subtree rename retw to ret2 Anand Jain
2024-03-19 18:22   ` Josef Bacik
2024-03-19 14:55 ` [PATCH 26/29] btrfs: btrfs_dirty_pages rename variable err to ret Anand Jain
2024-03-19 14:55 ` [PATCH 27/29] btrfs: prepare_pages rename " Anand Jain
2024-03-19 14:55 ` [PATCH 28/29] btrfs: btrfs_direct_write " Anand Jain
2024-03-19 14:55 ` [PATCH 29/29] btrfs: fixup_tree_root_location rename ret to ret2 and " Anand Jain
2024-03-19 18:24   ` Josef Bacik
2024-04-16 10:42     ` Anand Jain
2024-04-16 10:44       ` Anand Jain
2024-03-22  2:32 ` [PATCH 00/29] trivial adjustments for return variable coding style David Sterba
2024-03-25  9:37   ` Anand Jain

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=3dacbcffa8d7c4e70e934b8b977676a1072878f4.1710857863.git.anand.jain@oracle.com \
    --to=anand.jain@oracle.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.