vserver 1.9.5.x5

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

diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index 9051ac1..ef001a9 100644 (file)
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -22,7 +22,6 @@
 #include <linux/kernel.h>
 #include <linux/major.h>
 #include <linux/time.h>
-#include <linux/lp.h>
 #include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/fcntl.h>
@@ -310,8 +309,7 @@ static int coda_psdev_open(struct inode * inode, struct file * file)
 static int coda_psdev_release(struct inode * inode, struct file * file)
 {
         struct venus_comm *vcp = (struct venus_comm *) file->private_data;
-        struct upc_req *req;
-       struct list_head *lh, *next;
+        struct upc_req *req, *tmp;
 
        lock_kernel();
        if ( !vcp->vc_inuse ) {
@@ -326,8 +324,7 @@ static int coda_psdev_release(struct inode * inode, struct file * file)
        }
         
         /* Wakeup clients so they can return. */
-       list_for_each_safe(lh, next, &vcp->vc_pending) {
-               req = list_entry(lh, struct upc_req, uc_chain);
+       list_for_each_entry_safe(req, tmp, &vcp->vc_pending, uc_chain) {
                /* Async requests need to be freed here */
                if (req->uc_flags & REQ_ASYNC) {
                        CODA_FREE(req->uc_data, sizeof(struct coda_in_hdr));
@@ -361,13 +358,12 @@ static struct file_operations coda_psdev_fops = {
 static int init_coda_psdev(void)
 {
        int i, err = 0;
-       if (register_chrdev(CODA_PSDEV_MAJOR,"coda_psdev",
-                                &coda_psdev_fops)) {
+       if (register_chrdev(CODA_PSDEV_MAJOR, "coda", &coda_psdev_fops)) {
               printk(KERN_ERR "coda_psdev: unable to get major %d\n", 
                     CODA_PSDEV_MAJOR);
               return -EIO;
        }
-       coda_psdev_class = class_simple_create(THIS_MODULE, "coda_psdev");
+       coda_psdev_class = class_simple_create(THIS_MODULE, "coda");
        if (IS_ERR(coda_psdev_class)) {
                err = PTR_ERR(coda_psdev_class);
                goto out_chrdev;
@@ -389,7 +385,7 @@ out_class:
                class_simple_device_remove(MKDEV(CODA_PSDEV_MAJOR, i));
        class_simple_destroy(coda_psdev_class);
 out_chrdev:
-       unregister_chrdev(CODA_PSDEV_MAJOR, "coda_psdev");
+       unregister_chrdev(CODA_PSDEV_MAJOR, "coda");
 out:
        return err;
 }
@@ -434,7 +430,7 @@ out:
        }
        class_simple_destroy(coda_psdev_class);
        devfs_remove("coda");
-       unregister_chrdev(CODA_PSDEV_MAJOR,"coda_psdev");
+       unregister_chrdev(CODA_PSDEV_MAJOR, "coda");
        coda_sysctl_clean();
 out1:
        coda_destroy_inodecache();
@@ -456,7 +452,7 @@ static void __exit exit_coda(void)
        }
        class_simple_destroy(coda_psdev_class);
        devfs_remove("coda");
-       unregister_chrdev(CODA_PSDEV_MAJOR, "coda_psdev");
+       unregister_chrdev(CODA_PSDEV_MAJOR, "coda");
        coda_sysctl_clean();
        coda_destroy_inodecache();
 }