Commit 90135925 authored by David Teigland's avatar David Teigland Committed by Steven Whitehouse
Browse files

[DLM] Update DLM to the latest patch level


Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
Signed-off-by: default avatarSteve Whitehouse <swhiteho@redhat.com>
parent ec580024
......@@ -21,7 +21,7 @@ static struct list_head ast_queue;
static spinlock_t ast_queue_lock;
static struct task_struct * astd_task;
static unsigned long astd_wakeflags;
static struct semaphore astd_running;
static struct mutex astd_running;
void dlm_del_ast(struct dlm_lkb *lkb)
......@@ -56,7 +56,7 @@ static void process_asts(void)
int type = 0, found, bmode;
for (;;) {
found = FALSE;
found = 0;
spin_lock(&ast_queue_lock);
list_for_each_entry(lkb, &ast_queue, lkb_astqueue) {
r = lkb->lkb_resource;
......@@ -68,7 +68,7 @@ static void process_asts(void)
list_del(&lkb->lkb_astqueue);
type = lkb->lkb_ast_type;
lkb->lkb_ast_type = 0;
found = TRUE;
found = 1;
break;
}
spin_unlock(&ast_queue_lock);
......@@ -117,10 +117,10 @@ static int dlm_astd(void *data)
schedule();
set_current_state(TASK_RUNNING);
down(&astd_running);
mutex_lock(&astd_running);
if (test_and_clear_bit(WAKE_ASTS, &astd_wakeflags))
process_asts();
up(&astd_running);
mutex_unlock(&astd_running);
}
return 0;
}
......@@ -140,7 +140,7 @@ int dlm_astd_start(void)
INIT_LIST_HEAD(&ast_queue);
spin_lock_init(&ast_queue_lock);
init_MUTEX(&astd_running);
mutex_init(&astd_running);
p = kthread_run(dlm_astd, NULL, "dlm_astd");
if (IS_ERR(p))
......@@ -157,11 +157,11 @@ void dlm_astd_stop(void)
void dlm_astd_suspend(void)
{
down(&astd_running);
mutex_lock(&astd_running);
}
void dlm_astd_resume(void)
{
up(&astd_running);
mutex_unlock(&astd_running);
}
......@@ -162,7 +162,7 @@ struct spaces {
struct space {
struct config_group group;
struct list_head members;
struct semaphore members_lock;
struct mutex members_lock;
int members_count;
};
......@@ -374,7 +374,7 @@ static struct config_group *make_space(struct config_group *g, const char *name)
sp->group.default_groups[1] = NULL;
INIT_LIST_HEAD(&sp->members);
init_MUTEX(&sp->members_lock);
mutex_init(&sp->members_lock);
sp->members_count = 0;
return &sp->group;
......@@ -453,10 +453,10 @@ static struct config_item *make_node(struct config_group *g, const char *name)
nd->nodeid = -1;
nd->weight = 1; /* default weight of 1 if none is set */
down(&sp->members_lock);
mutex_lock(&sp->members_lock);
list_add(&nd->list, &sp->members);
sp->members_count++;
up(&sp->members_lock);
mutex_unlock(&sp->members_lock);
return &nd->item;
}
......@@ -466,10 +466,10 @@ static void drop_node(struct config_group *g, struct config_item *i)
struct space *sp = to_space(g->cg_item.ci_parent);
struct node *nd = to_node(i);
down(&sp->members_lock);
mutex_lock(&sp->members_lock);
list_del(&nd->list);
sp->members_count--;
up(&sp->members_lock);
mutex_unlock(&sp->members_lock);
config_item_put(i);
}
......@@ -677,7 +677,7 @@ int dlm_nodeid_list(char *lsname, int **ids_out)
if (!sp)
return -EEXIST;
down(&sp->members_lock);
mutex_lock(&sp->members_lock);
if (!sp->members_count) {
rv = 0;
goto out;
......@@ -698,7 +698,7 @@ int dlm_nodeid_list(char *lsname, int **ids_out)
*ids_out = ids;
out:
up(&sp->members_lock);
mutex_unlock(&sp->members_lock);
put_space(sp);
return rv;
}
......@@ -713,14 +713,14 @@ int dlm_node_weight(char *lsname, int nodeid)
if (!sp)
goto out;
down(&sp->members_lock);
mutex_lock(&sp->members_lock);
list_for_each_entry(nd, &sp->members, list) {
if (nd->nodeid != nodeid)
continue;
w = nd->weight;
break;
}
up(&sp->members_lock);
mutex_unlock(&sp->members_lock);
put_space(sp);
out:
return w;
......
......@@ -63,12 +63,12 @@ static void print_lock(struct seq_file *s, struct dlm_lkb *lkb,
/* FIXME: this warns on Alpha */
if (lkb->lkb_status == DLM_LKSTS_CONVERT
|| lkb->lkb_status == DLM_LKSTS_GRANTED)
seq_printf(s, " %" PRIx64 "-%" PRIx64,
seq_printf(s, " %llx-%llx",
lkb->lkb_range[GR_RANGE_START],
lkb->lkb_range[GR_RANGE_END]);
if (lkb->lkb_status == DLM_LKSTS_CONVERT
|| lkb->lkb_status == DLM_LKSTS_WAITING)
seq_printf(s, " (%" PRIx64 "-%" PRIx64 ")",
seq_printf(s, " (%llx-%llx)",
lkb->lkb_range[RQ_RANGE_START],
lkb->lkb_range[RQ_RANGE_END]);
}
......
......@@ -43,7 +43,7 @@
static struct file_operations _dlm_fops;
static const char *name_prefix="dlm";
static struct list_head user_ls_list;
static struct semaphore user_ls_lock;
static struct mutex user_ls_lock;
/* Lock infos are stored in here indexed by lock ID */
static DEFINE_IDR(lockinfo_idr);
......@@ -53,6 +53,7 @@ static rwlock_t lockinfo_lock;
#define LI_FLAG_COMPLETE 1
#define LI_FLAG_FIRSTLOCK 2
#define LI_FLAG_PERSISTENT 3
#define LI_FLAG_ONLIST 4
/* flags in ls_flags*/
#define LS_FLAG_DELETED 1
......@@ -211,18 +212,18 @@ static struct user_ls *find_lockspace(int minor)
{
struct user_ls *lsinfo;
down(&user_ls_lock);
mutex_lock(&user_ls_lock);
lsinfo = __find_lockspace(minor);
up(&user_ls_lock);
mutex_unlock(&user_ls_lock);
return lsinfo;
}
static void add_lockspace_to_list(struct user_ls *lsinfo)
{
down(&user_ls_lock);
mutex_lock(&user_ls_lock);
list_add(&lsinfo->ls_list, &user_ls_list);
up(&user_ls_lock);
mutex_unlock(&user_ls_lock);
}
/* Register a lockspace with the DLM and create a misc
......@@ -235,12 +236,11 @@ static int register_lockspace(char *name, struct user_ls **ls, int flags)
namelen = strlen(name)+strlen(name_prefix)+2;
newls = kmalloc(sizeof(struct user_ls), GFP_KERNEL);
newls = kzalloc(sizeof(struct user_ls), GFP_KERNEL);
if (!newls)
return -ENOMEM;
memset(newls, 0, sizeof(struct user_ls));
newls->ls_miscinfo.name = kmalloc(namelen, GFP_KERNEL);
newls->ls_miscinfo.name = kzalloc(namelen, GFP_KERNEL);
if (!newls->ls_miscinfo.name) {
kfree(newls);
return -ENOMEM;
......@@ -277,7 +277,7 @@ static int register_lockspace(char *name, struct user_ls **ls, int flags)
return 0;
}
/* Called with the user_ls_lock semaphore held */
/* Called with the user_ls_lock mutex held */
static int unregister_lockspace(struct user_ls *lsinfo, int force)
{
int status;
......@@ -305,11 +305,10 @@ static int unregister_lockspace(struct user_ls *lsinfo, int force)
static void add_to_astqueue(struct lock_info *li, void *astaddr, void *astparam,
int lvb_updated)
{
struct ast_info *ast = kmalloc(sizeof(struct ast_info), GFP_KERNEL);
struct ast_info *ast = kzalloc(sizeof(struct ast_info), GFP_KERNEL);
if (!ast)
return;
memset(ast, 0, sizeof(*ast));
ast->result.user_astparam = astparam;
ast->result.user_astaddr = astaddr;
ast->result.user_lksb = li->li_user_lksb;
......@@ -382,6 +381,7 @@ static void ast_routine(void *param)
spin_lock(&li->li_file->fi_li_lock);
list_del(&li->li_ownerqueue);
clear_bit(LI_FLAG_ONLIST, &li->li_flags);
spin_unlock(&li->li_file->fi_li_lock);
release_lockinfo(li);
return;
......@@ -437,7 +437,7 @@ static int dlm_open(struct inode *inode, struct file *file)
if (!lsinfo)
return -ENOENT;
f = kmalloc(sizeof(struct file_info), GFP_KERNEL);
f = kzalloc(sizeof(struct file_info), GFP_KERNEL);
if (!f)
return -ENOMEM;
......@@ -570,7 +570,7 @@ static int dlm_close(struct inode *inode, struct file *file)
* then free the struct. If it's an AUTOFREE lockspace
* then free the whole thing.
*/
down(&user_ls_lock);
mutex_lock(&user_ls_lock);
if (atomic_dec_and_test(&lsinfo->ls_refcnt)) {
if (lsinfo->ls_lockspace) {
......@@ -582,7 +582,7 @@ static int dlm_close(struct inode *inode, struct file *file)
kfree(lsinfo);
}
}
up(&user_ls_lock);
mutex_unlock(&user_ls_lock);
put_file_info(f);
/* Restore signals */
......@@ -620,10 +620,10 @@ static int do_user_remove_lockspace(struct file_info *fi, uint8_t cmd,
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
down(&user_ls_lock);
mutex_lock(&user_ls_lock);
lsinfo = __find_lockspace(kparams->minor);
if (!lsinfo) {
up(&user_ls_lock);
mutex_unlock(&user_ls_lock);
return -EINVAL;
}
......@@ -631,7 +631,7 @@ static int do_user_remove_lockspace(struct file_info *fi, uint8_t cmd,
force = 2;
status = unregister_lockspace(lsinfo, force);
up(&user_ls_lock);
mutex_unlock(&user_ls_lock);
return status;
}
......@@ -752,7 +752,7 @@ static struct lock_info *allocate_lockinfo(struct file_info *fi, uint8_t cmd,
if (!try_module_get(THIS_MODULE))
return NULL;
li = kmalloc(sizeof(struct lock_info), GFP_KERNEL);
li = kzalloc(sizeof(struct lock_info), GFP_KERNEL);
if (li) {
li->li_magic = LOCKINFO_MAGIC;
li->li_file = fi;
......@@ -800,8 +800,10 @@ static int do_user_lock(struct file_info *fi, uint8_t cmd,
/* If this is a persistent lock we will have to create a
lockinfo again */
if (!li && DLM_LKF_PERSISTENT) {
if (!li && (kparams->flags & DLM_LKF_PERSISTENT)) {
li = allocate_lockinfo(fi, cmd, kparams);
if (!li)
return -ENOMEM;
li->li_lksb.sb_lkid = kparams->lkid;
li->li_castaddr = kparams->castaddr;
......@@ -887,6 +889,7 @@ static int do_user_lock(struct file_info *fi, uint8_t cmd,
spin_lock(&fi->fi_li_lock);
list_add(&li->li_ownerqueue, &fi->fi_li_list);
set_bit(LI_FLAG_ONLIST, &li->li_flags);
spin_unlock(&fi->fi_li_lock);
if (add_lockinfo(li))
printk(KERN_WARNING "Add lockinfo failed\n");
......@@ -914,12 +917,13 @@ static int do_user_unlock(struct file_info *fi, uint8_t cmd,
li = get_lockinfo(kparams->lkid);
if (!li) {
li = allocate_lockinfo(fi, cmd, kparams);
if (!li)
return -ENOMEM;
spin_lock(&fi->fi_li_lock);
list_add(&li->li_ownerqueue, &fi->fi_li_list);
set_bit(LI_FLAG_ONLIST, &li->li_flags);
spin_unlock(&fi->fi_li_lock);
}
if (!li)
return -ENOMEM;
if (li->li_magic != LOCKINFO_MAGIC)
return -EINVAL;
......@@ -932,6 +936,12 @@ static int do_user_unlock(struct file_info *fi, uint8_t cmd,
if (kparams->flags & DLM_LKF_CANCEL && li->li_grmode != -1)
convert_cancel = 1;
/* Wait until dlm_lock() has completed */
if (!test_bit(LI_FLAG_ONLIST, &li->li_flags)) {
down(&li->li_firstlock);
up(&li->li_firstlock);
}
/* dlm_unlock() passes a 0 for castaddr which means don't overwrite
the existing li_castaddr as that's the completion routine for
unlocks. dlm_unlock_wait() specifies a new AST routine to be
......@@ -947,6 +957,7 @@ static int do_user_unlock(struct file_info *fi, uint8_t cmd,
if (!status && !convert_cancel) {
spin_lock(&fi->fi_li_lock);
list_del(&li->li_ownerqueue);
clear_bit(LI_FLAG_ONLIST, &li->li_flags);
spin_unlock(&fi->fi_li_lock);
}
......@@ -1055,7 +1066,7 @@ static int __init dlm_device_init(void)
int r;
INIT_LIST_HEAD(&user_ls_list);
init_MUTEX(&user_ls_lock);
mutex_init(&user_ls_lock);
rwlock_init(&lockinfo_lock);
ctl_device.name = "dlm-control";
......
......@@ -33,7 +33,7 @@ static void put_free_de(struct dlm_ls *ls, struct dlm_direntry *de)
static struct dlm_direntry *get_free_de(struct dlm_ls *ls, int len)
{
int found = FALSE;
int found = 0;
struct dlm_direntry *de;
spin_lock(&ls->ls_recover_list_lock);
......@@ -42,7 +42,7 @@ static struct dlm_direntry *get_free_de(struct dlm_ls *ls, int len)
list_del(&de->list);
de->master_nodeid = 0;
memset(de->name, 0, len);
found = TRUE;
found = 1;
break;
}
}
......
......@@ -35,6 +35,7 @@
#include <linux/kref.h>
#include <linux/kernel.h>
#include <linux/jhash.h>
#include <linux/mutex.h>
#include <asm/semaphore.h>
#include <asm/uaccess.h>
......@@ -42,20 +43,6 @@
#define DLM_LOCKSPACE_LEN 64
#ifndef TRUE
#define TRUE 1
#endif
#ifndef FALSE
#define FALSE 0
#endif
#if (BITS_PER_LONG == 64)
#define PRIx64 "lx"
#else
#define PRIx64 "Lx"
#endif
/* Size of the temp buffer midcomms allocates on the stack.
We try to make this large enough so most messages fit.
FIXME: should sctp make this unnecessary? */
......@@ -266,7 +253,7 @@ struct dlm_lkb {
struct dlm_rsb {
struct dlm_ls *res_ls; /* the lockspace */
struct kref res_ref;
struct semaphore res_sem;
struct mutex res_mutex;
unsigned long res_flags;
int res_length; /* length of rsb name */
int res_nodeid;
......@@ -449,7 +436,7 @@ struct dlm_ls {
struct dlm_dirtable *ls_dirtbl;
uint32_t ls_dirtbl_size;
struct semaphore ls_waiters_sem;
struct mutex ls_waiters_mutex;
struct list_head ls_waiters; /* lkbs needing a reply */
struct list_head ls_nodes; /* current nodes in ls */
......@@ -472,14 +459,14 @@ struct dlm_ls {
struct timer_list ls_timer;
struct task_struct *ls_recoverd_task;
struct semaphore ls_recoverd_active;
struct mutex ls_recoverd_active;
spinlock_t ls_recover_lock;
uint32_t ls_recover_status; /* DLM_RS_ */
uint64_t ls_recover_seq;
struct dlm_recover *ls_recover_args;
struct rw_semaphore ls_in_recovery; /* block local requests */
struct list_head ls_requestqueue;/* queue remote requests */
struct semaphore ls_requestqueue_lock;
struct mutex ls_requestqueue_mutex;
char *ls_recover_buf;
struct list_head ls_recover_list;
spinlock_t ls_recover_list_lock;
......
......@@ -215,15 +215,15 @@ static inline int is_master_copy(struct dlm_lkb *lkb)
{
if (lkb->lkb_flags & DLM_IFL_MSTCPY)
DLM_ASSERT(lkb->lkb_nodeid, dlm_print_lkb(lkb););
return (lkb->lkb_flags & DLM_IFL_MSTCPY) ? TRUE : FALSE;
return (lkb->lkb_flags & DLM_IFL_MSTCPY) ? 1 : 0;
}
static inline int middle_conversion(struct dlm_lkb *lkb)
{
if ((lkb->lkb_grmode==DLM_LOCK_PR && lkb->lkb_rqmode==DLM_LOCK_CW) ||
(lkb->lkb_rqmode==DLM_LOCK_PR && lkb->lkb_grmode==DLM_LOCK_CW))
return TRUE;
return FALSE;
return 1;
return 0;
}
static inline int down_conversion(struct dlm_lkb *lkb)
......@@ -269,7 +269,7 @@ static struct dlm_rsb *create_rsb(struct dlm_ls *ls, char *name, int len)
r->res_ls = ls;
r->res_length = len;
memcpy(r->res_name, name, len);
init_MUTEX(&r->res_sem);
mutex_init(&r->res_mutex);
INIT_LIST_HEAD(&r->res_lookup);
INIT_LIST_HEAD(&r->res_grantqueue);
......@@ -712,7 +712,7 @@ static void add_to_waiters(struct dlm_lkb *lkb, int mstype)
{
struct dlm_ls *ls = lkb->lkb_resource->res_ls;
down(&ls->ls_waiters_sem);
mutex_lock(&ls->ls_waiters_mutex);
if (lkb->lkb_wait_type) {
log_print("add_to_waiters error %d", lkb->lkb_wait_type);
goto out;
......@@ -721,7 +721,7 @@ static void add_to_waiters(struct dlm_lkb *lkb, int mstype)
kref_get(&lkb->lkb_ref);
list_add(&lkb->lkb_wait_reply, &ls->ls_waiters);
out:
up(&ls->ls_waiters_sem);
mutex_unlock(&ls->ls_waiters_mutex);
}
static int _remove_from_waiters(struct dlm_lkb *lkb)
......@@ -745,9 +745,9 @@ static int remove_from_waiters(struct dlm_lkb *lkb)
struct dlm_ls *ls = lkb->lkb_resource->res_ls;
int error;
down(&ls->ls_waiters_sem);
mutex_lock(&ls->ls_waiters_mutex);
error = _remove_from_waiters(lkb);
up(&ls->ls_waiters_sem);
mutex_unlock(&ls->ls_waiters_mutex);
return error;
}
......@@ -775,14 +775,14 @@ static int shrink_bucket(struct dlm_ls *ls, int b)
int count = 0, found;
for (;;) {
found = FALSE;
found = 0;
write_lock(&ls->ls_rsbtbl[b].lock);
list_for_each_entry_reverse(r, &ls->ls_rsbtbl[b].toss,
res_hashchain) {
if (!time_after_eq(jiffies, r->res_toss_time +
dlm_config.toss_secs * HZ))
continue;
found = TRUE;
found = 1;
break;
}
......@@ -1027,9 +1027,9 @@ static inline int first_in_list(struct dlm_lkb *lkb, struct list_head *head)
struct dlm_lkb *first = list_entry(head->next, struct dlm_lkb,
lkb_statequeue);
if (lkb->lkb_id == first->lkb_id)
return TRUE;
return 1;
return FALSE;
return 0;
}
/* Return 1 if the locks' ranges overlap. If the lkb has no range then it is
......@@ -1038,13 +1038,13 @@ static inline int first_in_list(struct dlm_lkb *lkb, struct list_head *head)
static inline int ranges_overlap(struct dlm_lkb *lkb1, struct dlm_lkb *lkb2)
{
if (!lkb1->lkb_range || !lkb2->lkb_range)
return TRUE;
return 1;
if (lkb1->lkb_range[RQ_RANGE_END] < lkb2->lkb_range[GR_RANGE_START] ||
lkb1->lkb_range[RQ_RANGE_START] > lkb2->lkb_range[GR_RANGE_END])
return FALSE;
return 0;
return TRUE;
return 1;
}
/* Check if the given lkb conflicts with another lkb on the queue. */
......@@ -1057,9 +1057,9 @@ static int queue_conflict(struct list_head *head, struct dlm_lkb *lkb)
if (this == lkb)
continue;
if (ranges_overlap(lkb, this) && !modes_compat(this, lkb))
return TRUE;
return 1;
}
return FALSE;
return 0;
}
/*
......@@ -1103,7 +1103,7 @@ static int conversion_deadlock_detect(struct dlm_rsb *rsb, struct dlm_lkb *lkb)
continue;
if (!modes_compat(this, lkb) && !modes_compat(lkb, this))
return TRUE;
return 1;
}
/* if lkb is on the convert queue and is preventing the first
......@@ -1114,10 +1114,10 @@ static int conversion_deadlock_detect(struct dlm_rsb *rsb, struct dlm_lkb *lkb)
if (self && self != first) {
if (!modes_compat(lkb, first) &&
!queue_conflict(&rsb->res_grantqueue, first))
return TRUE;
return 1;
}
return FALSE;
return 0;
}
/*
......@@ -1157,7 +1157,7 @@ static int _can_be_granted(struct dlm_rsb *r, struct dlm_lkb *lkb, int now)
*/
if (lkb->lkb_exflags & DLM_LKF_EXPEDITE)
return TRUE;
return 1;
/*
* A shortcut. Without this, !queue_conflict(grantqueue, lkb) would be
......@@ -1200,7 +1200,7 @@ static int _can_be_granted(struct dlm_rsb *r, struct dlm_lkb *lkb, int now)
*/
if (now && conv && !(lkb->lkb_exflags & DLM_LKF_QUECVT))
return TRUE;
return 1;
/*
* When using range locks the NOORDER flag is set to avoid the standard
......@@ -1208,7 +1208,7 @@ static int _can_be_granted(struct dlm_rsb *r, struct dlm_lkb *lkb, int now)
*/
if (lkb->lkb_exflags & DLM_LKF_NOORDER)
return TRUE;
return 1;
/*
* 6-3: Once in that queue [CONVERTING], a conversion request cannot be
......@@ -1217,7 +1217,7 @@ static int _can_be_granted(struct dlm_rsb *r, struct dlm_lkb *lkb, int now)
*/
if (!now && conv && first_in_list(lkb, &r->res_convertqueue))
return TRUE;
return 1;
/*
* 6-4: By default, a new request is immediately granted only if all
......@@ -1232,7 +1232,7 @@ static int _can_be_granted(struct dlm_rsb *r, struct dlm_lkb *lkb, int now)
if (now && !conv && list_empty(&r->res_convertqueue) &&
list_empty(&r->res_waitqueue))
return TRUE;
return 1;
/*
* 6-4: Once a lock request is in the queue of ungranted new requests,
......@@ -1244,7 +1244,7 @@ static int _can_be_granted(struct dlm_rsb *r, struct dlm_lkb *lkb, int now)
if (!now && !conv && list_empty(&r->res_convertqueue) &&
first_in_list(lkb, &r->res_waitqueue))
return TRUE;
return 1;
out:
/*
......@@ -1257,7 +1257,7 @@ static int _can_be_granted(struct dlm_rsb *r, struct dlm_lkb *lkb, int now)
lkb->lkb_sbflags |= DLM_SBF_DEMOTED;
}
return FALSE;
return 0;
}
/*
......@@ -1308,7 +1308,7 @@ static int grant_pending_convert(struct dlm_rsb *r, int high)
list_for_each_entry_safe(lkb, s, &r->res_convertqueue, lkb_statequeue) {
demoted = is_demoted(lkb);
if (can_be_granted(r, lkb, FALSE)) {
if (can_be_granted(r, lkb, 0)) {
grant_lock_pending(r, lkb);
grant_restart = 1;
} else {
......@@ -1333,7 +1333,7 @@ static int grant_pending_wait(struct dlm_rsb *r, int high)
struct dlm_lkb *lkb, *s;
list_for_each_entry_safe(lkb, s, &r->res_waitqueue, lkb_statequeue) {
if (can_be_granted(r, lkb, FALSE))
if