Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / coda / psdev.c

diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index ef001a9..6c6771d 100644 (file)
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -48,12 +48,9 @@
 #include <linux/coda_psdev.h>
 #include <linux/coda_proc.h>
 
-#define upc_free(r) kfree(r)
+#include "coda_int.h"
 
-/* 
- * Coda stuff
- */
-extern struct file_system_type coda_fs_type;
+#define upc_free(r) kfree(r)
 
 /* statistics */
 int           coda_hard;         /* allows signals during upcalls */
@@ -61,7 +58,7 @@ unsigned long coda_timeout = 30; /* .. secs, then signals will dequeue */
 
 
 struct venus_comm coda_comms[MAX_CODADEVS];
-static struct class_simple *coda_psdev_class;
+static struct class *coda_psdev_class;
 
 /*
  * Device operations
@@ -345,7 +342,7 @@ static int coda_psdev_release(struct inode * inode, struct file * file)
 }
 
 
-static struct file_operations coda_psdev_fops = {
+static const struct file_operations coda_psdev_fops = {
        .owner          = THIS_MODULE,
        .read           = coda_psdev_read,
        .write          = coda_psdev_write,
@@ -363,15 +360,15 @@ static int init_coda_psdev(void)
                     CODA_PSDEV_MAJOR);
               return -EIO;
        }
-       coda_psdev_class = class_simple_create(THIS_MODULE, "coda");
+       coda_psdev_class = class_create(THIS_MODULE, "coda");
        if (IS_ERR(coda_psdev_class)) {
                err = PTR_ERR(coda_psdev_class);
                goto out_chrdev;
        }               
        devfs_mk_dir ("coda");
        for (i = 0; i < MAX_CODADEVS; i++) {
-               class_simple_device_add(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR,i), 
-                               NULL, "cfs%d", i);
+               class_device_create(coda_psdev_class, NULL,
+                               MKDEV(CODA_PSDEV_MAJOR,i), NULL, "cfs%d", i);
                err = devfs_mk_cdev(MKDEV(CODA_PSDEV_MAJOR, i),
                                S_IFCHR|S_IRUSR|S_IWUSR, "coda/%d", i);
                if (err)
@@ -382,8 +379,8 @@ static int init_coda_psdev(void)
 
 out_class:
        for (i = 0; i < MAX_CODADEVS; i++) 
-               class_simple_device_remove(MKDEV(CODA_PSDEV_MAJOR, i));
-       class_simple_destroy(coda_psdev_class);
+               class_device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i));
+       class_destroy(coda_psdev_class);
 out_chrdev:
        unregister_chrdev(CODA_PSDEV_MAJOR, "coda");
 out:
@@ -394,8 +391,6 @@ out:
 MODULE_AUTHOR("Peter J. Braam <braam@cs.cmu.edu>");
 MODULE_LICENSE("GPL");
 
-extern int coda_init_inodecache(void);
-extern void coda_destroy_inodecache(void);
 static int __init init_coda(void)
 {
        int status;
@@ -425,10 +420,10 @@ static int __init init_coda(void)
        return 0;
 out:
        for (i = 0; i < MAX_CODADEVS; i++) {
-               class_simple_device_remove(MKDEV(CODA_PSDEV_MAJOR, i));
+               class_device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i));
                devfs_remove("coda/%d", i);
        }
-       class_simple_destroy(coda_psdev_class);
+       class_destroy(coda_psdev_class);
        devfs_remove("coda");
        unregister_chrdev(CODA_PSDEV_MAJOR, "coda");
        coda_sysctl_clean();
@@ -447,10 +442,10 @@ static void __exit exit_coda(void)
                 printk("coda: failed to unregister filesystem\n");
         }
        for (i = 0; i < MAX_CODADEVS; i++) {
-               class_simple_device_remove(MKDEV(CODA_PSDEV_MAJOR, i));
+               class_device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i));
                devfs_remove("coda/%d", i);
        }
-       class_simple_destroy(coda_psdev_class);
+       class_destroy(coda_psdev_class);
        devfs_remove("coda");
        unregister_chrdev(CODA_PSDEV_MAJOR, "coda");
        coda_sysctl_clean();