aboutsummaryrefslogtreecommitdiffstats
path: root/fs/dlm
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2006-07-26 09:29:06 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-07-26 14:42:05 -0400
commit20abf975f75d6fb45d8c055d30cdcb112ca8b608 (patch)
treea48e0f9c78475a9d2dfd9104abdc4cd142ca45ad /fs/dlm
parentba7f72901cfd437d6de087bf44d2b64357cb38a5 (diff)
[DLM] fix broken patches
On Wed, Jul 26, 2006 at 10:47:14AM +0100, Steven Whitehouse wrote: > Hi, > > I've applied all the patches you sent, but they don't build: Argh, sorry about that... when I fixed these a long time ago they somehow never got included in the quilt patches. I mistakenly assumed the quilt patches matched the source I had in front of me. Signed-off-by: David Teigland <teigland@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/dlm')
-rw-r--r--fs/dlm/debug_fs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/dlm/debug_fs.c b/fs/dlm/debug_fs.c
index 5faa747c7ca1..516f6c9ee4d5 100644
--- 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)
123 if (root_list || recover_list) { 123 if (root_list || recover_list) {
124 seq_printf(s, "Recovery: root %d recover %d flags %lx " 124 seq_printf(s, "Recovery: root %d recover %d flags %lx "
125 "count %d\n", root_list, recover_list, 125 "count %d\n", root_list, recover_list,
126 res->flags, res->res_recover_locks_count); 126 res->res_flags, res->res_recover_locks_count);
127 } 127 }
128 128
129 /* Print the locks attached to this resource */ 129 /* Print the locks attached to this resource */
@@ -277,7 +277,7 @@ static int rsb_open(struct inode *inode, struct file *file)
277 struct seq_file *seq; 277 struct seq_file *seq;
278 int ret; 278 int ret;
279 279
280 ret = rsb_seq_open(file, &rsb_seq_ops); 280 ret = seq_open(file, &rsb_seq_ops);
281 if (ret) 281 if (ret)
282 return ret; 282 return ret;
283 283
@@ -343,7 +343,7 @@ int dlm_create_debug_file(struct dlm_ls *ls)
343 dlm_root, 343 dlm_root,
344 ls, 344 ls,
345 &rsb_fops); 345 &rsb_fops);
346 if (!ls->ls_rsb_debug_dentry) 346 if (!ls->ls_debug_rsb_dentry)
347 return -ENOMEM; 347 return -ENOMEM;
348 348
349 memset(name, 0, sizeof(name)); 349 memset(name, 0, sizeof(name));