From: Alex Dewar <alex.dewar90@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: Alex Dewar <alex.dewar90@gmail.com>, Coly Li <colyli@suse.de>,
Kent Overstreet <kent.overstreet@gmail.com>,
linux-bcache@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] bcache: Use #ifdef instead of boolean variable
Date: Fri, 9 Oct 2020 19:34:47 +0100 [thread overview]
Message-ID: <20201009183447.1611204-1-alex.dewar90@gmail.com> (raw)
The variable async_registration is used to indicate whether or not
CONFIG_BCACHE_ASYNC_REGISTRATION is enabled, triggering a (false)
warning in Coverity about unreachable code. However, it seems clearer in
this case just to use an #ifdef, so let's do that instead.
Addresses-Coverity-ID: 1497746: Control flow issues (DEADCODE)
Signed-off-by: Alex Dewar <alex.dewar90@gmail.com>
---
drivers/md/bcache/super.c | 40 +++++++++++++++++----------------------
1 file changed, 17 insertions(+), 23 deletions(-)
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index 46a00134a36a..6d4127881c6a 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -2504,11 +2504,6 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,
struct cache_sb_disk *sb_disk;
struct block_device *bdev;
ssize_t ret;
- bool async_registration = false;
-
-#ifdef CONFIG_BCACHE_ASYNC_REGISTRATION
- async_registration = true;
-#endif
ret = -EBUSY;
err = "failed to reference bcache module";
@@ -2563,26 +2558,25 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,
err = "failed to register device";
- if (async_registration) {
- /* register in asynchronous way */
- struct async_reg_args *args =
- kzalloc(sizeof(struct async_reg_args), GFP_KERNEL);
-
- if (!args) {
- ret = -ENOMEM;
- err = "cannot allocate memory";
- goto out_put_sb_page;
- }
+#ifdef CONFIG_BCACHE_ASYNC_REGISTRATION
+ /* register in asynchronous way */
+ struct async_reg_args *args =
+ kzalloc(sizeof(struct async_reg_args), GFP_KERNEL);
- args->path = path;
- args->sb = sb;
- args->sb_disk = sb_disk;
- args->bdev = bdev;
- register_device_aync(args);
- /* No wait and returns to user space */
- goto async_done;
+ if (!args) {
+ ret = -ENOMEM;
+ err = "cannot allocate memory";
+ goto out_put_sb_page;
}
+ args->path = path;
+ args->sb = sb;
+ args->sb_disk = sb_disk;
+ args->bdev = bdev;
+ register_device_aync(args);
+ /* No wait and returns to user space */
+ return size;
+#else
if (SB_IS_BDEV(sb)) {
struct cached_dev *dc = kzalloc(sizeof(*dc), GFP_KERNEL);
@@ -2605,12 +2599,12 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,
if (register_cache(sb, sb_disk, bdev, ca) != 0)
goto out_free_sb;
}
+#endif
done:
kfree(sb);
kfree(path);
module_put(THIS_MODULE);
-async_done:
return size;
out_put_sb_page:
--
2.28.0
next reply other threads:[~2020-10-09 18:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-09 18:34 Alex Dewar [this message]
2020-10-09 19:14 ` kernel test robot
2020-10-09 22:39 ` kernel test robot
2020-10-09 23:00 ` Rasmus Villemoes
2020-10-10 2:05 ` Coly Li
2020-10-10 8:23 ` Alex Dewar
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=20201009183447.1611204-1-alex.dewar90@gmail.com \
--to=alex.dewar90@gmail.com \
--cc=colyli@suse.de \
--cc=kent.overstreet@gmail.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-kernel@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
Powered by JetHome