[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20241012075902.1320946-1-youling.tang@linux.dev>
Date: Sat, 12 Oct 2024 15:59:02 +0800
From: Youling Tang <youling.tang@...ux.dev>
To: Kent Overstreet <kent.overstreet@...ux.dev>
Cc: linux-bcachefs@...r.kernel.org,
linux-kernel@...r.kernel.org,
youling.tang@...ux.dev,
Youling Tang <tangyouling@...inos.cn>
Subject: [PATCH] bcachefs: Simplify code in bch2_dev_alloc()
From: Youling Tang <tangyouling@...inos.cn>
- Remove unnecessary variable 'ret'.
- Remove unnecessary bch2_dev_free() operations.
Signed-off-by: Youling Tang <tangyouling@...inos.cn>
---
fs/bcachefs/super.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/fs/bcachefs/super.c b/fs/bcachefs/super.c
index 843431e58cf5..a0e01443008b 100644
--- a/fs/bcachefs/super.c
+++ b/fs/bcachefs/super.c
@@ -1352,23 +1352,20 @@ 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;
+ if (bch2_fs_init_fault("dev_alloc")) {
+ bch_err(c, "dev_alloc fault injected");
+ return -EFAULT;
+ }
ca = __bch2_dev_alloc(c, &member);
if (!ca)
- goto err;
+ return -BCH_ERR_ENOMEM_dev_alloc;
ca->fs = c;
bch2_dev_attach(c, ca, dev_idx);
- return ret;
-err:
- if (ca)
- bch2_dev_free(ca);
- return -BCH_ERR_ENOMEM_dev_alloc;
+ return 0;
}
static int __bch2_dev_attach_bdev(struct bch_dev *ca, struct bch_sb_handle *sb)
--
2.34.1
Powered by blists - more mailing lists