[PATCH v2] bcachefs: Simplify code in bch2_dev_alloc()

From: Youling Tang
Date: Tue Oct 15 2024 - 21:50:01 EST


From: Youling Tang <tangyouling@xxxxxxxxxx>

- Remove unnecessary variable 'ret'.
- Remove unnecessary bch2_dev_free() operations.

Signed-off-by: Youling Tang <tangyouling@xxxxxxxxxx>
---
v2: Keep the 'goto err' style.

fs/bcachefs/super.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/fs/bcachefs/super.c b/fs/bcachefs/super.c
index 843431e58cf5..872e3d144fc4 100644
--- a/fs/bcachefs/super.c
+++ b/fs/bcachefs/super.c
@@ -1352,7 +1352,6 @@ static int bch2_dev_alloc(struct bch_fs *c, unsigned dev_idx)
{
struct bch_member member = bch2_sb_member_get(c->disk_sb.sb, dev_idx);
struct bch_dev *ca = NULL;
- int ret = 0;

if (bch2_fs_init_fault("dev_alloc"))
goto err;
@@ -1364,10 +1363,8 @@ static int bch2_dev_alloc(struct bch_fs *c, unsigned dev_idx)
ca->fs = c;

bch2_dev_attach(c, ca, dev_idx);
- return ret;
+ return 0;
err:
- if (ca)
- bch2_dev_free(ca);
return -BCH_ERR_ENOMEM_dev_alloc;
}

--
2.34.1