summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2023-01-15 21:42:13 +0100
committerZdenek Kabelac <zkabelac@redhat.com>2023-01-16 12:37:40 +0100
commit3bedceec3882e00caf62df6fbeb946aeafea9df2 (patch)
tree4a9c3528b27141499893977767fc253a47a34dd9
parentaa09232dc4fb825f4e643bbe87a95e2318dd5a93 (diff)
downloadlvm2-3bedceec3882e00caf62df6fbeb946aeafea9df2.tar.gz
libdm: correcting ifdef possition
Fix building without ioctl support.
-rw-r--r--device_mapper/ioctl/libdm-iface.c4
-rw-r--r--libdm/ioctl/libdm-iface.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/device_mapper/ioctl/libdm-iface.c b/device_mapper/ioctl/libdm-iface.c
index 738807f8f..d25b07800 100644
--- a/device_mapper/ioctl/libdm-iface.c
+++ b/device_mapper/ioctl/libdm-iface.c
@@ -139,7 +139,6 @@ static char *_align(char *ptr, unsigned int a)
return (char *) (((unsigned long) ptr + agn) & ~agn);
}
-#ifdef DM_IOCTLS
static unsigned _kernel_major = 0;
static unsigned _kernel_minor = 0;
static unsigned _kernel_release = 0;
@@ -182,6 +181,9 @@ int get_uname_version(unsigned *major, unsigned *minor, unsigned *release)
return 1;
}
+
+#ifdef DM_IOCTLS
+
/*
* Set number to NULL to populate _dm_bitset - otherwise first
* match is returned.
diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c
index 0fba79ce4..dfa91b866 100644
--- a/libdm/ioctl/libdm-iface.c
+++ b/libdm/ioctl/libdm-iface.c
@@ -138,7 +138,6 @@ static char *_align(char *ptr, unsigned int a)
return (char *) (((unsigned long) ptr + agn) & ~agn);
}
-#ifdef DM_IOCTLS
static unsigned _kernel_major = 0;
static unsigned _kernel_minor = 0;
static unsigned _kernel_release = 0;
@@ -181,6 +180,9 @@ int get_uname_version(unsigned *major, unsigned *minor, unsigned *release)
return 1;
}
+
+#ifdef DM_IOCTLS
+
/*
* Set number to NULL to populate _dm_bitset - otherwise first
* match is returned.