From: David Teigland Date: Wed, 26 Jul 2006 13:29:06 +0000 (-0500) Subject: [DLM] fix broken patches X-Git-Tag: v2.6.19-rc1~32^2~123 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20abf975f75d6fb45d8c055d30cdcb112ca8b608;hp=ba7f72901cfd437d6de087bf44d2b64357cb38a5;p=pandora-kernel.git [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 Signed-off-by: Steven Whitehouse --- 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) 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,7 +277,7 @@ 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; @@ -343,7 +343,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));