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

Move dm_cookie_supported check into dm_udev_get_sync_supprt function.

Browse Source 
We don't have to call dm_cookie_supported with dm_udev_get_sync_support
this way. Also, it's necessary for the current code to work properly on
systems without cookie support (older kernels).
This commit is contained in:
Peter Rajnoha 2009-09-11 16:11:25 +00:00
parent e94a31b2c6
commit 221b941eb5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libdm/libdm-common.c
View File

@ -881,7 +881,7 @@ int dm_udev_get_sync_support(void)
if (_udev_running < 0) if (_udev_running < 0)
_udev_running = _check_udev_is_running(); _udev_running = _check_udev_is_running();
return _udev_running && _sync_with_udev; return dm_cookie_supported() && _udev_running && _sync_with_udev;
} }
static int _get_cookie_sem(uint32_t cookie, int *semid) static int _get_cookie_sem(uint32_t cookie, int *semid)
@ -1064,7 +1064,7 @@ int dm_task_set_cookie(struct dm_task *dmt, uint32_t *cookie)
{ {
int semid; int semid;
if (!dm_udev_get_sync_support() || !dm_cookie_supported()) { if (!dm_udev_get_sync_support()) {
dmt->event_nr = *cookie = 0; dmt->event_nr = *cookie = 0;
return 1; return 1;
} }
@ -1099,7 +1099,7 @@ int dm_udev_complete(uint32_t cookie)
{ {
int semid; int semid;
if (!cookie || !dm_udev_get_sync_support() || !dm_cookie_supported()) if (!cookie || !dm_udev_get_sync_support())
return 1; return 1;
if (!_get_cookie_sem(cookie, &semid)) if (!_get_cookie_sem(cookie, &semid))
@ -1120,7 +1120,7 @@ int dm_udev_wait(uint32_t cookie)
int semid; int semid;
struct sembuf sb = {0, 0, 0}; struct sembuf sb = {0, 0, 0};
if (!cookie || !dm_udev_get_sync_support() || !dm_cookie_supported()) if (!cookie || !dm_udev_get_sync_support())
return 1; return 1;
if (!_get_cookie_sem(cookie, &semid)) if (!_get_cookie_sem(cookie, &semid))