Remove dead code about LKF_CONVERT flag

Since flags is only set as LKF_NOQUEUE, the code
with LKF_CONVERT flag should be delete.

Reported-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
This commit is contained in:
Guoqing Jiang 2016-03-07 17:31:03 +08:00 committed by Jes Sorensen
parent b138214fac
commit 21f541cc31
2 changed files with 0 additions and 9 deletions

View File

@ -64,7 +64,6 @@ typedef uint64_t cmap_handle_t;
#include <errno.h>
#else
#define LKF_NOQUEUE 0x00000001
#define LKF_CONVERT 0x00000004
#define LKM_PWMODE 4
#define EUNLOCK 0x10002

8
util.c
View File

@ -147,13 +147,7 @@ int cluster_get_dlmlock(int *lockid)
return -ENOMEM;
}
/* Conversions need the lockid in the LKSB */
if (flags & LKF_CONVERT)
dlm_lock_res->lksb.sb_lkid = *lockid;
snprintf(str, 64, "bitmap%s", cluster_name);
/* if flags with LKF_CONVERT causes below return ENOENT which means
* "No such file or directory" */
ret = dlm_hooks->ls_lock(dlm_lock_res->ls, LKM_PWMODE, &dlm_lock_res->lksb,
flags, str, strlen(str), 0, dlm_ast,
dlm_lock_res, NULL, NULL);
@ -177,8 +171,6 @@ int cluster_release_dlmlock(int lockid)
if (!cluster_name)
return -1;
/* if flags with LKF_CONVERT causes below return EINVAL which means
* "Invalid argument" */
ret = dlm_hooks->ls_unlock(dlm_lock_res->ls, lockid, 0,
&dlm_lock_res->lksb, dlm_lock_res);
if (ret) {