linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 1/4] btrfs: drop useless goto in open_fs_devices
Date: Fri,  4 Oct 2019 15:50:00 +0800	[thread overview]
Message-ID: <1570175403-4073-2-git-send-email-anand.jain@oracle.com> (raw)
In-Reply-To: <1570175403-4073-1-git-send-email-anand.jain@oracle.com>

There is no need of goto out in open_fs_devices() as there is nothing
special done at %out:. So refactor it.

Signed-off-by: Anand Jain <anand.jain@oracle.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 e176346afed1..06ec3577c6b4 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1330,7 +1330,6 @@ static int open_fs_devices(struct btrfs_fs_devices *fs_devices,
 {
 	struct btrfs_device *device;
 	struct btrfs_device *latest_dev = NULL;
-	int ret = 0;
 
 	flags |= FMODE_EXCL;
 
@@ -1343,15 +1342,14 @@ static int open_fs_devices(struct btrfs_fs_devices *fs_devices,
 		    device->generation > latest_dev->generation)
 			latest_dev = device;
 	}
-	if (fs_devices->open_devices == 0) {
-		ret = -EINVAL;
-		goto out;
-	}
+	if (fs_devices->open_devices == 0)
+		return -EINVAL;
+
 	fs_devices->opened = 1;
 	fs_devices->latest_bdev = latest_dev->bdev;
 	fs_devices->total_rw_bytes = 0;
-out:
-	return ret;
+
+	return 0;
 }
 
 static int devid_cmp(void *priv, struct list_head *a, struct list_head *b)
-- 
1.8.3.1


  reply	other threads:[~2019-10-04  7:50 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-04  7:49 [PATCH 0/4] btrfs: fix issues due to alien device Anand Jain
2019-10-04  7:50 ` Anand Jain [this message]
2019-10-04  8:12   ` [PATCH 1/4] btrfs: drop useless goto in open_fs_devices Nikolay Borisov
2019-10-04  7:50 ` [PATCH 2/4] btrfs: delete identified alien device " Anand Jain
2019-10-04  8:18   ` Nikolay Borisov
2019-10-06  2:47     ` [PATCH v2 " Anand Jain
2019-10-06 11:44       ` Nikolay Borisov
2019-10-06  2:51     ` [PATCH " Anand Jain
2019-10-04  7:50 ` [PATCH 3/4] btrfs: include non-missing as a qualifier for the latest_bdev Anand Jain
2019-10-04  8:11   ` Nikolay Borisov
2019-10-04  9:08     ` [Not TLS] " Graham Cobb
2019-10-04  9:20       ` Nikolay Borisov
2019-10-04  7:50 ` [PATCH 4/4] btrfs: free alien device due to device add Anand Jain
2019-10-04  8:19 ` [PATCH 0/4] btrfs: fix issues due to alien device Nikolay Borisov
2019-10-07  9:42   ` 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=1570175403-4073-2-git-send-email-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 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).