From: Karel Zak <kzak@redhat.com>
Date: Mon, 17 Jan 2022 11:36:11 +0000 (+0100)
Subject: libblkid: remove unnecessary ifdef
X-Git-Tag: v2.38-rc1~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed1f6f10b12be36fd0d7080163e0920fe09df970;p=thirdparty%2Futil-linux.git

libblkid: remove unnecessary ifdef

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index 513649916d..6168370e2f 100644
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -876,9 +876,6 @@ int blkid_probe_set_device(blkid_probe pr, int fd,
 	struct stat sb;
 	uint64_t devsiz = 0;
 	char *dm_uuid = NULL;
-#ifdef CDROM_GET_CAPABILITY
-	long last_written = 0;
-#endif
 
 	blkid_reset_probe(pr);
 	blkid_probe_reset_buffers(pr);
@@ -971,6 +968,8 @@ int blkid_probe_set_device(blkid_probe pr, int fd,
 	    !dm_uuid &&
 	    blkid_probe_is_wholedisk(pr)) {
 
+		long last_written = 0;
+
 		/*
 		 * pktcdvd.ko accepts only these ioctls:
 		 *   CDROMEJECT CDROMMULTISESSION CDROMREADTOCENTRY