Hi,

I had an issue building ceph into the 2.6.26 kernel because of the
removal of proc_root_fs from the 2.6.26 release due to this patch -
http://lkml.org/lkml/2008/3/30/55

I was encountering the following error when building the 2.6.26 kernel
because of this:

 CC      fs/ceph/proc.o
fs/ceph/proc.c: In function ceph_proc_init:
fs/ceph/proc.c:65: error: proc_root_fs undeclared (first use in this function)
fs/ceph/proc.c:65: error: (Each undeclared identifier is reported only once
fs/ceph/proc.c:65: error: for each function it appears in.)
fs/ceph/proc.c: In function ceph_proc_cleanup:
fs/ceph/proc.c:94: error: proc_root_fs undeclared (first use in this function)
make[2]: *** [fs/ceph/proc.o] Error 1
make[1]: *** [fs/ceph] Error 2
make: *** [fs] Error 2

So I'm submitting a simple patch for resolving this issue. I have
tested this out on 2.6.24, 2.6.25, and 2.6.26 kernels and it works
fine. I'm pretty sure my email client has mangled this patch and
converted tabs to spaces (if so I apologize).

-Padraig

---
diff -ur a/src/kernel/proc.c b/src/kernel/proc.c
--- a/src/kernel/proc.c
+++ b/src/kernel/proc.c
@@ -62,7 +62,7 @@ int ceph_proc_init(void)
 {
        struct proc_dir_entry *pde;

-       proc_fs_ceph = proc_mkdir("ceph", proc_root_fs);
+       proc_fs_ceph = proc_mkdir("fs/ceph", NULL);
        if (!proc_fs_ceph)
                return -ENOMEM;

@@ -91,5 +91,5 @@ void ceph_proc_cleanup()
        remove_proc_entry("debug", proc_fs_ceph);
        remove_proc_entry("debug_msgr", proc_fs_ceph);
        remove_proc_entry("debug_console", proc_fs_ceph);
-       remove_proc_entry("ceph", proc_root_fs);
+       remove_proc_entry("fs/ceph", NULL);
 }
---

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Ceph-devel mailing list
Ceph-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ceph-devel

Reply via email to