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 */
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,
{
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);
return rv;
}
-static struct file_operations waiters_fops = {
+static const struct file_operations waiters_fops = {
.owner = THIS_MODULE,
.open = waiters_open,
.read = waiters_read
dlm_root,
ls,
&rsb_fops);
- if (!ls->ls_rsb_debug_dentry)
+ if (!ls->ls_debug_rsb_dentry)
return -ENOMEM;
memset(name, 0, sizeof(name));