ocfs2: Allow direct I/O read past end of file

[powerpc.git] / fs / dlm / debug_fs.c

diff --git a/fs/dlm/debug_fs.c b/fs/dlm/debug_fs.c
index 8f471d9..ca94a83 100644 (file)
--- a/fs/dlm/debug_fs.c
+++ b/fs/dlm/debug_fs.c
@@ -282,7 +282,7 @@ static int rsb_open(struct inode *inode, struct file *file)
                return ret;
 
        seq = file->private_data;
-       seq->private = inode->u.generic_ip;
+       seq->private = inode->i_private;
 
        return 0;
 }
@@ -301,7 +301,7 @@ static struct file_operations rsb_fops = {
 
 static int waiters_open(struct inode *inode, struct file *file)
 {
-       file->private_data = inode->u.generic_ip;
+       file->private_data = inode->i_private;
        return 0;
 }
 
@@ -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);