Commit 16e98462 authored by Alexander Aring's avatar Alexander Aring Committed by David Teigland

dlm: remove callback queue debugfs functionality

Remove the ability to dump pending lkb callbacks from debugfs.
The prepares for separating lkb structs from callbacks.
Signed-off-by: default avatarAlexander Aring <aahringo@redhat.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent 1131f339
...@@ -366,52 +366,6 @@ static void print_format4(struct dlm_rsb *r, struct seq_file *s) ...@@ -366,52 +366,6 @@ static void print_format4(struct dlm_rsb *r, struct seq_file *s)
unlock_rsb(r); unlock_rsb(r);
} }
static void print_format5_lock(struct seq_file *s, struct dlm_lkb *lkb)
{
struct dlm_callback *cb;
/* lkb_id lkb_flags mode flags sb_status sb_flags */
spin_lock(&lkb->lkb_cb_lock);
list_for_each_entry(cb, &lkb->lkb_callbacks, list) {
seq_printf(s, "%x %x %d %x %d %x\n",
lkb->lkb_id,
dlm_iflags_val(lkb),
cb->mode,
cb->flags,
cb->sb_status,
cb->sb_flags);
}
spin_unlock(&lkb->lkb_cb_lock);
}
static void print_format5(struct dlm_rsb *r, struct seq_file *s)
{
struct dlm_lkb *lkb;
lock_rsb(r);
list_for_each_entry(lkb, &r->res_grantqueue, lkb_statequeue) {
print_format5_lock(s, lkb);
if (seq_has_overflowed(s))
goto out;
}
list_for_each_entry(lkb, &r->res_convertqueue, lkb_statequeue) {
print_format5_lock(s, lkb);
if (seq_has_overflowed(s))
goto out;
}
list_for_each_entry(lkb, &r->res_waitqueue, lkb_statequeue) {
print_format5_lock(s, lkb);
if (seq_has_overflowed(s))
goto out;
}
out:
unlock_rsb(r);
}
struct rsbtbl_iter { struct rsbtbl_iter {
struct dlm_rsb *rsb; struct dlm_rsb *rsb;
unsigned bucket; unsigned bucket;
...@@ -455,13 +409,6 @@ static int table_seq_show(struct seq_file *seq, void *iter_ptr) ...@@ -455,13 +409,6 @@ static int table_seq_show(struct seq_file *seq, void *iter_ptr)
} }
print_format4(ri->rsb, seq); print_format4(ri->rsb, seq);
break; break;
case 5:
if (ri->header) {
seq_puts(seq, "lkb_id lkb_flags mode flags sb_status sb_flags\n");
ri->header = 0;
}
print_format5(ri->rsb, seq);
break;
} }
return 0; return 0;
...@@ -471,7 +418,6 @@ static const struct seq_operations format1_seq_ops; ...@@ -471,7 +418,6 @@ static const struct seq_operations format1_seq_ops;
static const struct seq_operations format2_seq_ops; static const struct seq_operations format2_seq_ops;
static const struct seq_operations format3_seq_ops; static const struct seq_operations format3_seq_ops;
static const struct seq_operations format4_seq_ops; static const struct seq_operations format4_seq_ops;
static const struct seq_operations format5_seq_ops;
static void *table_seq_start(struct seq_file *seq, loff_t *pos) static void *table_seq_start(struct seq_file *seq, loff_t *pos)
{ {
...@@ -503,8 +449,6 @@ static void *table_seq_start(struct seq_file *seq, loff_t *pos) ...@@ -503,8 +449,6 @@ static void *table_seq_start(struct seq_file *seq, loff_t *pos)
ri->format = 3; ri->format = 3;
if (seq->op == &format4_seq_ops) if (seq->op == &format4_seq_ops)
ri->format = 4; ri->format = 4;
if (seq->op == &format5_seq_ops)
ri->format = 5;
tree = toss ? &ls->ls_rsbtbl[bucket].toss : &ls->ls_rsbtbl[bucket].keep; tree = toss ? &ls->ls_rsbtbl[bucket].toss : &ls->ls_rsbtbl[bucket].keep;
...@@ -659,18 +603,10 @@ static const struct seq_operations format4_seq_ops = { ...@@ -659,18 +603,10 @@ static const struct seq_operations format4_seq_ops = {
.show = table_seq_show, .show = table_seq_show,
}; };
static const struct seq_operations format5_seq_ops = {
.start = table_seq_start,
.next = table_seq_next,
.stop = table_seq_stop,
.show = table_seq_show,
};
static const struct file_operations format1_fops; static const struct file_operations format1_fops;
static const struct file_operations format2_fops; static const struct file_operations format2_fops;
static const struct file_operations format3_fops; static const struct file_operations format3_fops;
static const struct file_operations format4_fops; static const struct file_operations format4_fops;
static const struct file_operations format5_fops;
static int table_open1(struct inode *inode, struct file *file) static int table_open1(struct inode *inode, struct file *file)
{ {
...@@ -757,20 +693,6 @@ static int table_open4(struct inode *inode, struct file *file) ...@@ -757,20 +693,6 @@ static int table_open4(struct inode *inode, struct file *file)
return 0; return 0;
} }
static int table_open5(struct inode *inode, struct file *file)
{
struct seq_file *seq;
int ret;
ret = seq_open(file, &format5_seq_ops);
if (ret)
return ret;
seq = file->private_data;
seq->private = inode->i_private; /* the dlm_ls */
return 0;
}
static const struct file_operations format1_fops = { static const struct file_operations format1_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = table_open1, .open = table_open1,
...@@ -804,14 +726,6 @@ static const struct file_operations format4_fops = { ...@@ -804,14 +726,6 @@ static const struct file_operations format4_fops = {
.release = seq_release .release = seq_release
}; };
static const struct file_operations format5_fops = {
.owner = THIS_MODULE,
.open = table_open5,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release
};
/* /*
* dump lkb's on the ls_waiters list * dump lkb's on the ls_waiters list
*/ */
...@@ -1021,16 +935,6 @@ void dlm_create_debug_file(struct dlm_ls *ls) ...@@ -1021,16 +935,6 @@ void dlm_create_debug_file(struct dlm_ls *ls)
dlm_root, dlm_root,
ls, ls,
&waiters_fops); &waiters_fops);
/* format 5 */
snprintf(name, sizeof(name), "%s_queued_asts", ls->ls_name);
ls->ls_debug_queued_asts_dentry = debugfs_create_file(name,
0644,
dlm_root,
ls,
&format5_fops);
} }
void __init dlm_register_debugfs(void) void __init dlm_register_debugfs(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment