From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Whitehouse Date: Fri, 06 Jul 2007 15:50:02 +0100 Subject: [Cluster-devel] Re: [PATCH] dlm: dump more lock values In-Reply-To: <20070706144708.GA8414@redhat.com> References: <20070706144708.GA8414@redhat.com> Message-ID: <1183733402.8765.172.camel@quoit> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 > > 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;