shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-23 21:35:29 +03:00
Code Releases Activity

Check that udev is running and set internal state appropriately.

Browse Source
This commit is contained in:
Peter Rajnoha 2009-09-11 15:56:06 +00:00
parent 24b598b1be
commit f2d3b3661b
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.52 -
=================================
Check that udev is running and set internal state appropriately.
Add libudev configuration check.
Add lvm2app.sh to nightly tests conditional upon configure --enable-applib.
Update lvm_vg_remove to require lvm_vg_write to commit remove to disk.

50
libdm/libdm-common.c
View File

@ -28,6 +28,9 @@
# include <sys/types.h>
# include <sys/ipc.h>
# include <sys/sem.h>
#ifdef HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE
# include <libudev.h>
#endif
#endif
#ifdef linux
@ -45,6 +48,7 @@ static char _dm_dir[PATH_MAX] = DEV_DIR DM_DIR;
static int _verbose = 0;
#ifdef UDEV_SYNC_SUPPORT
static int _udev_running = -1;
static int _sync_with_udev = 1;
#endif
@ -825,14 +829,58 @@ int dm_udev_wait(uint32_t cookie)
#else /* UDEV_SYNC_SUPPORT */
static int _check_udev_is_running(void)
{
#ifndef HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE
log_debug("Could not get udev state because libudev library "
"was not found and it was not compiled in. "
"Assuming udev is not running.");
return 0;
#else /* HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE */
struct udev *udev;
struct udev_queue *udev_queue;
int r;
if (!(udev = udev_new()))
goto error;
if (!(udev_queue = udev_queue_new(udev))) {
udev_unref(udev);
goto error;
}
r = udev_queue_get_udev_is_active(udev_queue);
if (!r)
log_debug("Udev is not running. "
"Not using udev synchronisation code.");
udev_queue_unref(udev_queue);
udev_unref(udev);
return r;
error:
log_debug("Could not get udev state. Assuming udev is not running.");
return 0;
#endif /* HAVE_UDEV_QUEUE_GET_UDEV_IS_ACTIVE */
}
void dm_udev_set_sync_support(int sync_with_udev)
{
if (_udev_running < 0)
_udev_running = _check_udev_is_running();
_sync_with_udev = sync_with_udev;
}
int dm_udev_get_sync_support(void)
{
return _sync_with_udev;
if (_udev_running < 0)
_udev_running = _check_udev_is_running();
return _udev_running && _sync_with_udev;
}
static int _get_cookie_sem(uint32_t cookie, int *semid)