From: Mike Yuan <me@yhndnzj.com>
Date: Thu, 2 Jan 2025 03:22:46 +0000 (+0100)
Subject: shared/blockdev-util: shorten the code a bit
X-Git-Tag: v258-rc1~1750^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b0818fa455314cf07f3b556f9f45b4f21fd6997;p=thirdparty%2Fsystemd.git

shared/blockdev-util: shorten the code a bit

If btrfs_get_block_device_fd() returns 0, ret is already initialized.
---

diff --git a/src/shared/blockdev-util.c b/src/shared/blockdev-util.c
index 53d60bd0dd7..57dfe3a19c3 100644
--- a/src/shared/blockdev-util.c
+++ b/src/shared/blockdev-util.c
@@ -263,9 +263,7 @@ int get_block_device_fd(int fd, dev_t *ret) {
         }
 
         r = btrfs_get_block_device_fd(fd, ret);
-        if (r > 0)
-                return 1;
-        if (r != -ENOTTY) /* not btrfs */
+        if (r != -ENOTTY) /* ENOTTY: not btrfs */
                 return r;
 
         *ret = 0;