shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

libdm: cleanup complation without DM_IOCTLS

Browse Source
This commit is contained in:
Zdenek Kabelac 2014-04-29 23:40:43 +02:00
parent ad77fb50bd
commit 905d4cda7a
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libdm/ioctl/libdm-iface.c
View File

@ -68,10 +68,6 @@ static unsigned _dm_version_minor = 0;
static unsigned _dm_version_patchlevel = 0; static unsigned _dm_version_patchlevel = 0;
static int _log_suppress = 0; static int _log_suppress = 0;
static int _kernel_major = 0;
static int _kernel_minor = 0;
static int _kernel_release = 0;
/* /*
* If the kernel dm driver only supports one major number * If the kernel dm driver only supports one major number
* we store it in _dm_device_major. Otherwise we indicate * we store it in _dm_device_major. Otherwise we indicate
@ -133,6 +129,11 @@ static char *_align(char *ptr, unsigned int a)
return (char *) (((unsigned long) ptr + agn) & ~agn); return (char *) (((unsigned long) ptr + agn) & ~agn);
} }
#ifdef DM_IOCTLS
static int _kernel_major = 0;
static int _kernel_minor = 0;
static int _kernel_release = 0;
static int _uname(void) static int _uname(void)
{ {
static int _uts_set = 0; static int _uts_set = 0;
@ -148,9 +149,7 @@ static int _uname(void)
} }
parts = sscanf(_uts.release, "%d.%d.%d", parts = sscanf(_uts.release, "%d.%d.%d",
&_kernel_major, &_kernel_major, &_kernel_minor, &_kernel_release);
&_kernel_minor,
&_kernel_release);
/* Kernels with a major number of 2 always had 3 parts. */ /* Kernels with a major number of 2 always had 3 parts. */
if (parts < 1 || (_kernel_major < 3 && parts < 3)) { if (parts < 1 || (_kernel_major < 3 && parts < 3)) {
@ -162,7 +161,6 @@ static int _uname(void)
return 1; return 1;
} }
#ifdef DM_IOCTLS
/* /*
* Set number to NULL to populate _dm_bitset - otherwise first * Set number to NULL to populate _dm_bitset - otherwise first
* match is returned. * match is returned.
@ -357,6 +355,7 @@ static void _close_control_fd(void)
} }
} }
#ifdef DM_IOCTLS
static int _open_and_assign_control_fd(const char *control) static int _open_and_assign_control_fd(const char *control)
{ {
if ((_control_fd = open(control, O_RDWR)) < 0) { if ((_control_fd = open(control, O_RDWR)) < 0) {
@ -366,6 +365,7 @@ static int _open_and_assign_control_fd(const char *control)
return 1; return 1;
} }
#endif
static int _open_control(void) static int _open_control(void)
{ {
@ -1285,6 +1285,7 @@ static int _udev_complete(struct dm_task *dmt)
return 1; return 1;
} }
#ifdef DM_IOCTLS
static int _check_uevent_generated(struct dm_ioctl *dmi) static int _check_uevent_generated(struct dm_ioctl *dmi)
{ {
if (!dm_check_version() || if (!dm_check_version() ||
@ -1295,6 +1296,7 @@ static int _check_uevent_generated(struct dm_ioctl *dmi)
return dmi->flags & DM_UEVENT_GENERATED_FLAG; return dmi->flags & DM_UEVENT_GENERATED_FLAG;
} }
#endif
static int _create_and_load_v4(struct dm_task *dmt) static int _create_and_load_v4(struct dm_task *dmt)
{ {
@ -1598,6 +1600,7 @@ static const char *_sanitise_message(char *message)
return sanitised_message; return sanitised_message;
} }
#ifdef DM_IOCTLS
static int _do_dm_ioctl_unmangle_string(char *str, const char *str_name, static int _do_dm_ioctl_unmangle_string(char *str, const char *str_name,
char *buf, size_t buf_size, char *buf, size_t buf_size,
dm_string_mangling_t mode) dm_string_mangling_t mode)
@ -1658,6 +1661,7 @@ static int _dm_ioctl_unmangle_uuids(int type, struct dm_ioctl *dmi)
return 1; return 1;
} }
#endif
static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command, static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command,
unsigned buffer_repeat_count, unsigned buffer_repeat_count,
@ -1794,6 +1798,7 @@ static struct dm_ioctl *_do_dm_ioctl(struct dm_task *dmt, unsigned command,
goto error; goto error;
#else /* Userspace alternative for testing */ #else /* Userspace alternative for testing */
goto error;
#endif #endif
return dmi; return dmi;