* [Cluster-devel] [PATCH] dlm: dump more lock values
@ 2007-07-06 14:47 David Teigland
2007-07-06 14:50 ` [Cluster-devel] " Steven Whitehouse
0 siblings, 1 reply; 3+ messages in thread
From: David Teigland @ 2007-07-06 14:47 UTC (permalink / raw)
To: cluster-devel.redhat.com
Add two more output fields (lkb_flags and rsb nodeid) to the new debugfs
file that dumps one lock per line. Also, dump all locks instead of just
mastered locks. Accordingly, use a suffix of _locks instead of _master.
Signed-off-by: David Teigland <teigland@redhat.com>
Index: linux-quilt/fs/dlm/debug_fs.c
===================================================================
--- linux-quilt.orig/fs/dlm/debug_fs.c 2007-07-02 13:38:18.000000000 -0500
+++ linux-quilt/fs/dlm/debug_fs.c 2007-07-02 15:50:04.000000000 -0500
@@ -27,7 +27,7 @@
struct rsb_iter {
int entry;
- int master;
+ int locks;
int header;
struct dlm_ls *ls;
struct list_head *next;
@@ -60,8 +60,8 @@
}
}
-static void print_lock(struct seq_file *s, struct dlm_lkb *lkb,
- struct dlm_rsb *res)
+static void print_resource_lock(struct seq_file *s, struct dlm_lkb *lkb,
+ struct dlm_rsb *res)
{
seq_printf(s, "%08x %s", lkb->lkb_id, print_lockmode(lkb->lkb_grmode));
@@ -134,15 +134,15 @@
/* Print the locks attached to this resource */
seq_printf(s, "Granted Queue\n");
list_for_each_entry(lkb, &res->res_grantqueue, lkb_statequeue)
- print_lock(s, lkb, res);
+ print_resource_lock(s, lkb, res);
seq_printf(s, "Conversion Queue\n");
list_for_each_entry(lkb, &res->res_convertqueue, lkb_statequeue)
- print_lock(s, lkb, res);
+ print_resource_lock(s, lkb, res);
seq_printf(s, "Waiting Queue\n");
list_for_each_entry(lkb, &res->res_waitqueue, lkb_statequeue)
- print_lock(s, lkb, res);
+ print_resource_lock(s, lkb, res);
if (list_empty(&res->res_lookup))
goto out;
@@ -160,8 +160,7 @@
return 0;
}
-static void print_master_lock(struct seq_file *s, struct dlm_lkb *lkb,
- struct dlm_rsb *r)
+static void print_lock(struct seq_file *s, struct dlm_lkb *lkb, struct dlm_rsb *r)
{
struct dlm_user_args *ua;
unsigned int waiting = 0;
@@ -176,37 +175,40 @@
if (lkb->lkb_timestamp)
waiting = jiffies_to_msecs(jiffies - lkb->lkb_timestamp);
- /* id nodeid remid pid xid flags sts grmode rqmode time_ms len name */
+ /* id nodeid remid pid xid exflags flags sts grmode rqmode time_ms
+ r_nodeid r_len r_name */
- seq_printf(s, "%x %d %x %u %llu %x %d %d %d %u %d \"%s\"\n",
+ seq_printf(s, "%x %d %x %u %llu %x %x %d %d %d %u %u %d \"%s\"\n",
lkb->lkb_id,
lkb->lkb_nodeid,
lkb->lkb_remid,
lkb->lkb_ownpid,
(unsigned long long)xid,
lkb->lkb_exflags,
+ lkb->lkb_flags,
lkb->lkb_status,
lkb->lkb_grmode,
lkb->lkb_rqmode,
waiting,
+ r->res_nodeid,
r->res_length,
r->res_name);
}
-static int print_master_resource(struct dlm_rsb *r, struct seq_file *s)
+static int print_locks(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_master_lock(s, lkb, r);
+ print_lock(s, lkb, r);
list_for_each_entry(lkb, &r->res_convertqueue, lkb_statequeue)
- print_master_lock(s, lkb, r);
+ print_lock(s, lkb, r);
list_for_each_entry(lkb, &r->res_waitqueue, lkb_statequeue)
- print_master_lock(s, lkb, r);
+ print_lock(s, lkb, r);
unlock_rsb(r);
return 0;
@@ -325,14 +327,14 @@
{
struct rsb_iter *ri = iter_ptr;
- if (ri->master) {
+ if (ri->locks) {
if (ri->header) {
- seq_printf(file, "id nodeid remid pid xid flags sts "
- "grmode rqmode time_ms len name\n");
+ seq_printf(file, "id nodeid remid pid xid exflags flags "
+ "sts grmode rqmode time_ms r_nodeid "
+ "r_len r_name\n");
ri->header = 0;
}
- if (is_master(ri->rsb))
- print_master_resource(ri->rsb, file);
+ print_locks(ri->rsb, file);
} else {
print_resource(ri->rsb, file);
}
@@ -371,10 +373,10 @@
};
/*
- * Dump master lock state
+ * Dump state in compact per-lock listing
*/
-static struct rsb_iter *master_iter_init(struct dlm_ls *ls, loff_t *pos)
+static struct rsb_iter *locks_iter_init(struct dlm_ls *ls, loff_t *pos)
{
struct rsb_iter *ri;
@@ -385,7 +387,7 @@
ri->ls = ls;
ri->entry = 0;
ri->next = NULL;
- ri->master = 1;
+ ri->locks = 1;
if (*pos == 0)
ri->header = 1;
@@ -398,12 +400,12 @@
return ri;
}
-static void *master_seq_start(struct seq_file *file, loff_t *pos)
+static void *locks_seq_start(struct seq_file *file, loff_t *pos)
{
struct rsb_iter *ri;
loff_t n = *pos;
- ri = master_iter_init(file->private, pos);
+ ri = locks_iter_init(file->private, pos);
if (!ri)
return NULL;
@@ -417,19 +419,19 @@
return ri;
}
-static struct seq_operations master_seq_ops = {
- .start = master_seq_start,
+static struct seq_operations locks_seq_ops = {
+ .start = locks_seq_start,
.next = rsb_seq_next,
.stop = rsb_seq_stop,
.show = rsb_seq_show,
};
-static int master_open(struct inode *inode, struct file *file)
+static int locks_open(struct inode *inode, struct file *file)
{
struct seq_file *seq;
int ret;
- ret = seq_open(file, &master_seq_ops);
+ ret = seq_open(file, &locks_seq_ops);
if (ret)
return ret;
@@ -439,9 +441,9 @@
return 0;
}
-static const struct file_operations master_fops = {
+static const struct file_operations locks_fops = {
.owner = THIS_MODULE,
- .open = master_open,
+ .open = locks_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release
@@ -515,14 +517,14 @@
}
memset(name, 0, sizeof(name));
- snprintf(name, DLM_LOCKSPACE_LEN+8, "%s_master", ls->ls_name);
+ snprintf(name, DLM_LOCKSPACE_LEN+8, "%s_locks", ls->ls_name);
- ls->ls_debug_master_dentry = debugfs_create_file(name,
- S_IFREG | S_IRUGO,
- dlm_root,
- ls,
- &master_fops);
- if (!ls->ls_debug_master_dentry) {
+ ls->ls_debug_locks_dentry = debugfs_create_file(name,
+ S_IFREG | S_IRUGO,
+ dlm_root,
+ ls,
+ &locks_fops);
+ if (!ls->ls_debug_locks_dentry) {
debugfs_remove(ls->ls_debug_waiters_dentry);
debugfs_remove(ls->ls_debug_rsb_dentry);
return -ENOMEM;
@@ -537,8 +539,8 @@
debugfs_remove(ls->ls_debug_rsb_dentry);
if (ls->ls_debug_waiters_dentry)
debugfs_remove(ls->ls_debug_waiters_dentry);
- if (ls->ls_debug_master_dentry)
- debugfs_remove(ls->ls_debug_master_dentry);
+ if (ls->ls_debug_locks_dentry)
+ debugfs_remove(ls->ls_debug_locks_dentry);
}
int dlm_register_debugfs(void)
Index: linux-quilt/fs/dlm/dlm_internal.h
===================================================================
--- linux-quilt.orig/fs/dlm/dlm_internal.h 2007-07-02 13:38:18.000000000 -0500
+++ linux-quilt/fs/dlm/dlm_internal.h 2007-07-02 14:04:35.000000000 -0500
@@ -471,7 +471,7 @@
struct dentry *ls_debug_rsb_dentry; /* debugfs */
struct dentry *ls_debug_waiters_dentry; /* debugfs */
- struct dentry *ls_debug_master_dentry; /* debugfs */
+ struct dentry *ls_debug_locks_dentry; /* debugfs */
wait_queue_head_t ls_uevent_wait; /* user part of join/leave */
int ls_uevent_result;
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Cluster-devel] Re: [PATCH] dlm: dump more lock values
2007-07-06 14:47 [Cluster-devel] [PATCH] dlm: dump more lock values David Teigland
@ 2007-07-06 14:50 ` Steven Whitehouse
0 siblings, 0 replies; 3+ messages in thread
From: Steven Whitehouse @ 2007-07-06 14:50 UTC (permalink / raw)
To: cluster-devel.redhat.com
Hi,
Now applied to the -nmw git tree. Thanks,
Steve.
On Fri, 2007-07-06 at 09:47 -0500, David Teigland wrote:
> Add two more output fields (lkb_flags and rsb nodeid) to the new debugfs
> file that dumps one lock per line. Also, dump all locks instead of just
> mastered locks. Accordingly, use a suffix of _locks instead of _master.
>
> Signed-off-by: David Teigland <teigland@redhat.com>
>
> Index: linux-quilt/fs/dlm/debug_fs.c
> ===================================================================
> --- linux-quilt.orig/fs/dlm/debug_fs.c 2007-07-02 13:38:18.000000000 -0500
> +++ linux-quilt/fs/dlm/debug_fs.c 2007-07-02 15:50:04.000000000 -0500
> @@ -27,7 +27,7 @@
>
> struct rsb_iter {
> int entry;
> - int master;
> + int locks;
> int header;
> struct dlm_ls *ls;
> struct list_head *next;
> @@ -60,8 +60,8 @@
> }
> }
>
> -static void print_lock(struct seq_file *s, struct dlm_lkb *lkb,
> - struct dlm_rsb *res)
> +static void print_resource_lock(struct seq_file *s, struct dlm_lkb *lkb,
> + struct dlm_rsb *res)
> {
> seq_printf(s, "%08x %s", lkb->lkb_id, print_lockmode(lkb->lkb_grmode));
>
> @@ -134,15 +134,15 @@
> /* Print the locks attached to this resource */
> seq_printf(s, "Granted Queue\n");
> list_for_each_entry(lkb, &res->res_grantqueue, lkb_statequeue)
> - print_lock(s, lkb, res);
> + print_resource_lock(s, lkb, res);
>
> seq_printf(s, "Conversion Queue\n");
> list_for_each_entry(lkb, &res->res_convertqueue, lkb_statequeue)
> - print_lock(s, lkb, res);
> + print_resource_lock(s, lkb, res);
>
> seq_printf(s, "Waiting Queue\n");
> list_for_each_entry(lkb, &res->res_waitqueue, lkb_statequeue)
> - print_lock(s, lkb, res);
> + print_resource_lock(s, lkb, res);
>
> if (list_empty(&res->res_lookup))
> goto out;
> @@ -160,8 +160,7 @@
> return 0;
> }
>
> -static void print_master_lock(struct seq_file *s, struct dlm_lkb *lkb,
> - struct dlm_rsb *r)
> +static void print_lock(struct seq_file *s, struct dlm_lkb *lkb, struct dlm_rsb *r)
> {
> struct dlm_user_args *ua;
> unsigned int waiting = 0;
> @@ -176,37 +175,40 @@
> if (lkb->lkb_timestamp)
> waiting = jiffies_to_msecs(jiffies - lkb->lkb_timestamp);
>
> - /* id nodeid remid pid xid flags sts grmode rqmode time_ms len name */
> + /* id nodeid remid pid xid exflags flags sts grmode rqmode time_ms
> + r_nodeid r_len r_name */
>
> - seq_printf(s, "%x %d %x %u %llu %x %d %d %d %u %d \"%s\"\n",
> + seq_printf(s, "%x %d %x %u %llu %x %x %d %d %d %u %u %d \"%s\"\n",
> lkb->lkb_id,
> lkb->lkb_nodeid,
> lkb->lkb_remid,
> lkb->lkb_ownpid,
> (unsigned long long)xid,
> lkb->lkb_exflags,
> + lkb->lkb_flags,
> lkb->lkb_status,
> lkb->lkb_grmode,
> lkb->lkb_rqmode,
> waiting,
> + r->res_nodeid,
> r->res_length,
> r->res_name);
> }
>
> -static int print_master_resource(struct dlm_rsb *r, struct seq_file *s)
> +static int print_locks(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_master_lock(s, lkb, r);
> + print_lock(s, lkb, r);
>
> list_for_each_entry(lkb, &r->res_convertqueue, lkb_statequeue)
> - print_master_lock(s, lkb, r);
> + print_lock(s, lkb, r);
>
> list_for_each_entry(lkb, &r->res_waitqueue, lkb_statequeue)
> - print_master_lock(s, lkb, r);
> + print_lock(s, lkb, r);
>
> unlock_rsb(r);
> return 0;
> @@ -325,14 +327,14 @@
> {
> struct rsb_iter *ri = iter_ptr;
>
> - if (ri->master) {
> + if (ri->locks) {
> if (ri->header) {
> - seq_printf(file, "id nodeid remid pid xid flags sts "
> - "grmode rqmode time_ms len name\n");
> + seq_printf(file, "id nodeid remid pid xid exflags flags "
> + "sts grmode rqmode time_ms r_nodeid "
> + "r_len r_name\n");
> ri->header = 0;
> }
> - if (is_master(ri->rsb))
> - print_master_resource(ri->rsb, file);
> + print_locks(ri->rsb, file);
> } else {
> print_resource(ri->rsb, file);
> }
> @@ -371,10 +373,10 @@
> };
>
> /*
> - * Dump master lock state
> + * Dump state in compact per-lock listing
> */
>
> -static struct rsb_iter *master_iter_init(struct dlm_ls *ls, loff_t *pos)
> +static struct rsb_iter *locks_iter_init(struct dlm_ls *ls, loff_t *pos)
> {
> struct rsb_iter *ri;
>
> @@ -385,7 +387,7 @@
> ri->ls = ls;
> ri->entry = 0;
> ri->next = NULL;
> - ri->master = 1;
> + ri->locks = 1;
>
> if (*pos == 0)
> ri->header = 1;
> @@ -398,12 +400,12 @@
> return ri;
> }
>
> -static void *master_seq_start(struct seq_file *file, loff_t *pos)
> +static void *locks_seq_start(struct seq_file *file, loff_t *pos)
> {
> struct rsb_iter *ri;
> loff_t n = *pos;
>
> - ri = master_iter_init(file->private, pos);
> + ri = locks_iter_init(file->private, pos);
> if (!ri)
> return NULL;
>
> @@ -417,19 +419,19 @@
> return ri;
> }
>
> -static struct seq_operations master_seq_ops = {
> - .start = master_seq_start,
> +static struct seq_operations locks_seq_ops = {
> + .start = locks_seq_start,
> .next = rsb_seq_next,
> .stop = rsb_seq_stop,
> .show = rsb_seq_show,
> };
>
> -static int master_open(struct inode *inode, struct file *file)
> +static int locks_open(struct inode *inode, struct file *file)
> {
> struct seq_file *seq;
> int ret;
>
> - ret = seq_open(file, &master_seq_ops);
> + ret = seq_open(file, &locks_seq_ops);
> if (ret)
> return ret;
>
> @@ -439,9 +441,9 @@
> return 0;
> }
>
> -static const struct file_operations master_fops = {
> +static const struct file_operations locks_fops = {
> .owner = THIS_MODULE,
> - .open = master_open,
> + .open = locks_open,
> .read = seq_read,
> .llseek = seq_lseek,
> .release = seq_release
> @@ -515,14 +517,14 @@
> }
>
> memset(name, 0, sizeof(name));
> - snprintf(name, DLM_LOCKSPACE_LEN+8, "%s_master", ls->ls_name);
> + snprintf(name, DLM_LOCKSPACE_LEN+8, "%s_locks", ls->ls_name);
>
> - ls->ls_debug_master_dentry = debugfs_create_file(name,
> - S_IFREG | S_IRUGO,
> - dlm_root,
> - ls,
> - &master_fops);
> - if (!ls->ls_debug_master_dentry) {
> + ls->ls_debug_locks_dentry = debugfs_create_file(name,
> + S_IFREG | S_IRUGO,
> + dlm_root,
> + ls,
> + &locks_fops);
> + if (!ls->ls_debug_locks_dentry) {
> debugfs_remove(ls->ls_debug_waiters_dentry);
> debugfs_remove(ls->ls_debug_rsb_dentry);
> return -ENOMEM;
> @@ -537,8 +539,8 @@
> debugfs_remove(ls->ls_debug_rsb_dentry);
> if (ls->ls_debug_waiters_dentry)
> debugfs_remove(ls->ls_debug_waiters_dentry);
> - if (ls->ls_debug_master_dentry)
> - debugfs_remove(ls->ls_debug_master_dentry);
> + if (ls->ls_debug_locks_dentry)
> + debugfs_remove(ls->ls_debug_locks_dentry);
> }
>
> int dlm_register_debugfs(void)
> Index: linux-quilt/fs/dlm/dlm_internal.h
> ===================================================================
> --- linux-quilt.orig/fs/dlm/dlm_internal.h 2007-07-02 13:38:18.000000000 -0500
> +++ linux-quilt/fs/dlm/dlm_internal.h 2007-07-02 14:04:35.000000000 -0500
> @@ -471,7 +471,7 @@
>
> struct dentry *ls_debug_rsb_dentry; /* debugfs */
> struct dentry *ls_debug_waiters_dentry; /* debugfs */
> - struct dentry *ls_debug_master_dentry; /* debugfs */
> + struct dentry *ls_debug_locks_dentry; /* debugfs */
>
> wait_queue_head_t ls_uevent_wait; /* user part of join/leave */
> int ls_uevent_result;
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Cluster-devel] [PATCH] [DLM] dump more lock values
2007-07-09 16:03 ` [Cluster-devel] [PATCH] [GFS2] Remove i_mode passing from NFS File Handle swhiteho
@ 2007-07-09 16:03 ` swhiteho
0 siblings, 0 replies; 3+ messages in thread
From: swhiteho @ 2007-07-09 16:03 UTC (permalink / raw)
To: cluster-devel.redhat.com
From: David Teigland <teigland@redhat.com>
Add two more output fields (lkb_flags and rsb nodeid) to the new debugfs
file that dumps one lock per line. Also, dump all locks instead of just
mastered locks. Accordingly, use a suffix of _locks instead of _master.
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
diff --git a/fs/dlm/debug_fs.c b/fs/dlm/debug_fs.c
index 9f5de37..12c3bfd 100644
--- a/fs/dlm/debug_fs.c
+++ b/fs/dlm/debug_fs.c
@@ -27,7 +27,7 @@ static struct dentry *dlm_root;
struct rsb_iter {
int entry;
- int master;
+ int locks;
int header;
struct dlm_ls *ls;
struct list_head *next;
@@ -60,8 +60,8 @@ static char *print_lockmode(int mode)
}
}
-static void print_lock(struct seq_file *s, struct dlm_lkb *lkb,
- struct dlm_rsb *res)
+static void print_resource_lock(struct seq_file *s, struct dlm_lkb *lkb,
+ struct dlm_rsb *res)
{
seq_printf(s, "%08x %s", lkb->lkb_id, print_lockmode(lkb->lkb_grmode));
@@ -134,15 +134,15 @@ static int print_resource(struct dlm_rsb *res, struct seq_file *s)
/* Print the locks attached to this resource */
seq_printf(s, "Granted Queue\n");
list_for_each_entry(lkb, &res->res_grantqueue, lkb_statequeue)
- print_lock(s, lkb, res);
+ print_resource_lock(s, lkb, res);
seq_printf(s, "Conversion Queue\n");
list_for_each_entry(lkb, &res->res_convertqueue, lkb_statequeue)
- print_lock(s, lkb, res);
+ print_resource_lock(s, lkb, res);
seq_printf(s, "Waiting Queue\n");
list_for_each_entry(lkb, &res->res_waitqueue, lkb_statequeue)
- print_lock(s, lkb, res);
+ print_resource_lock(s, lkb, res);
if (list_empty(&res->res_lookup))
goto out;
@@ -160,8 +160,7 @@ static int print_resource(struct dlm_rsb *res, struct seq_file *s)
return 0;
}
-static void print_master_lock(struct seq_file *s, struct dlm_lkb *lkb,
- struct dlm_rsb *r)
+static void print_lock(struct seq_file *s, struct dlm_lkb *lkb, struct dlm_rsb *r)
{
struct dlm_user_args *ua;
unsigned int waiting = 0;
@@ -176,37 +175,40 @@ static void print_master_lock(struct seq_file *s, struct dlm_lkb *lkb,
if (lkb->lkb_timestamp)
waiting = jiffies_to_msecs(jiffies - lkb->lkb_timestamp);
- /* id nodeid remid pid xid flags sts grmode rqmode time_ms len name */
+ /* id nodeid remid pid xid exflags flags sts grmode rqmode time_ms
+ r_nodeid r_len r_name */
- seq_printf(s, "%x %d %x %u %llu %x %d %d %d %u %d \"%s\"\n",
+ seq_printf(s, "%x %d %x %u %llu %x %x %d %d %d %u %u %d \"%s\"\n",
lkb->lkb_id,
lkb->lkb_nodeid,
lkb->lkb_remid,
lkb->lkb_ownpid,
(unsigned long long)xid,
lkb->lkb_exflags,
+ lkb->lkb_flags,
lkb->lkb_status,
lkb->lkb_grmode,
lkb->lkb_rqmode,
waiting,
+ r->res_nodeid,
r->res_length,
r->res_name);
}
-static int print_master_resource(struct dlm_rsb *r, struct seq_file *s)
+static int print_locks(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_master_lock(s, lkb, r);
+ print_lock(s, lkb, r);
list_for_each_entry(lkb, &r->res_convertqueue, lkb_statequeue)
- print_master_lock(s, lkb, r);
+ print_lock(s, lkb, r);
list_for_each_entry(lkb, &r->res_waitqueue, lkb_statequeue)
- print_master_lock(s, lkb, r);
+ print_lock(s, lkb, r);
unlock_rsb(r);
return 0;
@@ -325,14 +327,14 @@ static int rsb_seq_show(struct seq_file *file, void *iter_ptr)
{
struct rsb_iter *ri = iter_ptr;
- if (ri->master) {
+ if (ri->locks) {
if (ri->header) {
- seq_printf(file, "id nodeid remid pid xid flags sts "
- "grmode rqmode time_ms len name\n");
+ seq_printf(file, "id nodeid remid pid xid exflags flags "
+ "sts grmode rqmode time_ms r_nodeid "
+ "r_len r_name\n");
ri->header = 0;
}
- if (is_master(ri->rsb))
- print_master_resource(ri->rsb, file);
+ print_locks(ri->rsb, file);
} else {
print_resource(ri->rsb, file);
}
@@ -371,10 +373,10 @@ static const struct file_operations rsb_fops = {
};
/*
- * Dump master lock state
+ * Dump state in compact per-lock listing
*/
-static struct rsb_iter *master_iter_init(struct dlm_ls *ls, loff_t *pos)
+static struct rsb_iter *locks_iter_init(struct dlm_ls *ls, loff_t *pos)
{
struct rsb_iter *ri;
@@ -385,7 +387,7 @@ static struct rsb_iter *master_iter_init(struct dlm_ls *ls, loff_t *pos)
ri->ls = ls;
ri->entry = 0;
ri->next = NULL;
- ri->master = 1;
+ ri->locks = 1;
if (*pos == 0)
ri->header = 1;
@@ -398,12 +400,12 @@ static struct rsb_iter *master_iter_init(struct dlm_ls *ls, loff_t *pos)
return ri;
}
-static void *master_seq_start(struct seq_file *file, loff_t *pos)
+static void *locks_seq_start(struct seq_file *file, loff_t *pos)
{
struct rsb_iter *ri;
loff_t n = *pos;
- ri = master_iter_init(file->private, pos);
+ ri = locks_iter_init(file->private, pos);
if (!ri)
return NULL;
@@ -417,19 +419,19 @@ static void *master_seq_start(struct seq_file *file, loff_t *pos)
return ri;
}
-static struct seq_operations master_seq_ops = {
- .start = master_seq_start,
+static struct seq_operations locks_seq_ops = {
+ .start = locks_seq_start,
.next = rsb_seq_next,
.stop = rsb_seq_stop,
.show = rsb_seq_show,
};
-static int master_open(struct inode *inode, struct file *file)
+static int locks_open(struct inode *inode, struct file *file)
{
struct seq_file *seq;
int ret;
- ret = seq_open(file, &master_seq_ops);
+ ret = seq_open(file, &locks_seq_ops);
if (ret)
return ret;
@@ -439,9 +441,9 @@ static int master_open(struct inode *inode, struct file *file)
return 0;
}
-static const struct file_operations master_fops = {
+static const struct file_operations locks_fops = {
.owner = THIS_MODULE,
- .open = master_open,
+ .open = locks_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release
@@ -515,14 +517,14 @@ int dlm_create_debug_file(struct dlm_ls *ls)
}
memset(name, 0, sizeof(name));
- snprintf(name, DLM_LOCKSPACE_LEN+8, "%s_master", ls->ls_name);
-
- ls->ls_debug_master_dentry = debugfs_create_file(name,
- S_IFREG | S_IRUGO,
- dlm_root,
- ls,
- &master_fops);
- if (!ls->ls_debug_master_dentry) {
+ snprintf(name, DLM_LOCKSPACE_LEN+8, "%s_locks", ls->ls_name);
+
+ ls->ls_debug_locks_dentry = debugfs_create_file(name,
+ S_IFREG | S_IRUGO,
+ dlm_root,
+ ls,
+ &locks_fops);
+ if (!ls->ls_debug_locks_dentry) {
debugfs_remove(ls->ls_debug_waiters_dentry);
debugfs_remove(ls->ls_debug_rsb_dentry);
return -ENOMEM;
@@ -537,8 +539,8 @@ void dlm_delete_debug_file(struct dlm_ls *ls)
debugfs_remove(ls->ls_debug_rsb_dentry);
if (ls->ls_debug_waiters_dentry)
debugfs_remove(ls->ls_debug_waiters_dentry);
- if (ls->ls_debug_master_dentry)
- debugfs_remove(ls->ls_debug_master_dentry);
+ if (ls->ls_debug_locks_dentry)
+ debugfs_remove(ls->ls_debug_locks_dentry);
}
int dlm_register_debugfs(void)
diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
index 8ac0818..74901e9 100644
--- a/fs/dlm/dlm_internal.h
+++ b/fs/dlm/dlm_internal.h
@@ -471,7 +471,7 @@ struct dlm_ls {
struct dentry *ls_debug_rsb_dentry; /* debugfs */
struct dentry *ls_debug_waiters_dentry; /* debugfs */
- struct dentry *ls_debug_master_dentry; /* debugfs */
+ struct dentry *ls_debug_locks_dentry; /* debugfs */
wait_queue_head_t ls_uevent_wait; /* user part of join/leave */
int ls_uevent_result;
--
1.5.1.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-07-09 16:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-06 14:47 [Cluster-devel] [PATCH] dlm: dump more lock values David Teigland
2007-07-06 14:50 ` [Cluster-devel] " Steven Whitehouse
-- strict thread matches above, loose matches on Subject: below --
2007-07-09 16:02 [Cluster-devel] [GFS2/DLM] Pre-pull Patch Posting swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] flush the glock completely in inode_go_sync swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] fix a couple of races swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] kernel changes to support new gfs2_grow command swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Kernel changes to support new gfs2_grow command (part 2) swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] use zero_user_page swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Addendum patch 2 for gfs2_grow swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Reduce size of struct gdlm_lock swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Clean up inode number handling swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Quotas non-functional - fix bug swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] keep dlm from panicing when traversing rsb list in debugfs swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] block scand during recovery [1/6] swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] add lock timeouts and warnings [2/6] swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] dlm_device interface changes [3/6] swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] cancel in conversion deadlock [4/6] swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] fix new_lockspace error exit [5/6] swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] wait for config check during join [6/6] swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] fix compile breakage swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] latest gfs2-nmw headers break userland build swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] Compile fix swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] timeout fixes swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] canceling deadlocked lock swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] dumping master locks swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] show default protocol swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Quotas non-functional - fix another bug swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Make the log reserved blocks depend on block size swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] fix socket shutdown swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] fix jdata issues swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Fix sign problem in quota/statfs and cleanup _host structures swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Add nanosecond timestamp feature swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] fix reference counting swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] variable allocation swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Fix typo in rename of directories swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Fix bug in error path of inode swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Can't mount GFS2 file system on AoE device swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Recovery for lost unlinked inodes swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] gfs2_lookupi() uninitialised var fix swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] set plock owner in GETLK info swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] return conflicts for GETLK swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Fix deallocation issues swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] don't require FS flag on all nodes swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Journaled file write/unstuff bug swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Remove bogus '\0' in rgrp.c swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Use zero_user_page() in stuffed_readpage() swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] assertion failure after writing to journaled file, umount swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Simplify multiple glock aquisition swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Addendum to the journaled file/unmount patch swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Fix gfs2_block_truncate_page err return swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] Telnet to port 21064 can stop all lockspaces swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] inode size inconsistency swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] remounting w/o acl option leaves acls enabled swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] System won't suspend with GFS2 file system mounted swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] git-gfs2-nmw-build-fix swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Obtaining no_formal_ino from directory entry swhiteho
2007-07-09 16:03 ` [Cluster-devel] [PATCH] [GFS2] Remove i_mode passing from NFS File Handle swhiteho
2007-07-09 16:03 ` [Cluster-devel] [PATCH] [DLM] dump more lock values swhiteho
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.