Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux...

[~andy/linux] / fs / dlm / debug_fs.c

diff --git a/fs/dlm/debug_fs.c b/fs/dlm/debug_fs.c
index 5faa747c7ca1fcdd1fd20f028fe224f47d27b6bc..61ba670b9e025fde7f8cedb28fd96ceee483de67 100644 (file)
--- a/fs/dlm/debug_fs.c
+++ b/fs/dlm/debug_fs.c
@@ -123,7 +123,7 @@ static int print_resource(struct dlm_rsb *res, struct seq_file *s)
        if (root_list || recover_list) {
                seq_printf(s, "Recovery: root %d recover %d flags %lx "
                           "count %d\n", root_list, recover_list,
-                          res->flags, res->res_recover_locks_count);
+                          res->res_flags, res->res_recover_locks_count);
        }
 
        /* Print the locks attached to this resource */
@@ -277,17 +277,17 @@ static int rsb_open(struct inode *inode, struct file *file)
        struct seq_file *seq;
        int ret;
 
-       ret = rsb_seq_open(file, &rsb_seq_ops);
+       ret = seq_open(file, &rsb_seq_ops);
        if (ret)
                return ret;
 
        seq = file->private_data;
-       seq->private = inode->u.generic_ip;
+       seq->private = inode->i_private;
 
        return 0;
 }
 
-static struct file_operations rsb_fops = {
+static const struct file_operations rsb_fops = {
        .owner   = THIS_MODULE,
        .open    = rsb_open,
        .read    = seq_read,
@@ -310,16 +310,19 @@ static ssize_t waiters_read(struct file *file, char __user *userbuf,
 {
        struct dlm_ls *ls = file->private_data;
        struct dlm_lkb *lkb;
-       size_t len = DLM_DEBUG_BUF_LEN, pos = 0, rv;
+       size_t len = DLM_DEBUG_BUF_LEN, pos = 0, ret, rv;
 
        mutex_lock(&debug_buf_lock);
        mutex_lock(&ls->ls_waiters_mutex);
        memset(debug_buf, 0, sizeof(debug_buf));
 
        list_for_each_entry(lkb, &ls->ls_waiters, lkb_wait_reply) {
-               pos += snprintf(debug_buf + pos, len - pos, "%x %d %d %s\n",
-                               lkb->lkb_id, lkb->lkb_wait_type,
-                               lkb->lkb_nodeid, lkb->lkb_resource->res_name);
+               ret = snprintf(debug_buf + pos, len - pos, "%x %d %d %s\n",
+                              lkb->lkb_id, lkb->lkb_wait_type,
+                              lkb->lkb_nodeid, lkb->lkb_resource->res_name);
+               if (ret >= len - pos)
+                       break;
+               pos += ret;
        }
        mutex_unlock(&ls->ls_waiters_mutex);
 
@@ -328,7 +331,7 @@ static ssize_t waiters_read(struct file *file, char __user *userbuf,
        return rv;
 }
 
-static struct file_operations waiters_fops = {
+static const struct file_operations waiters_fops = {
        .owner   = THIS_MODULE,
        .open    = waiters_open,
        .read    = waiters_read
@@ -343,7 +346,7 @@ int dlm_create_debug_file(struct dlm_ls *ls)
                                                      dlm_root,
                                                      ls,
                                                      &rsb_fops);
-       if (!ls->ls_rsb_debug_dentry)
+       if (!ls->ls_debug_rsb_dentry)
                return -ENOMEM;
 
        memset(name, 0, sizeof(name));