include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / drivers / isdn / capi / capifs.c

diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c
index 6ae0edf..2b83850 100644 (file)
--- a/drivers/isdn/capi/capifs.c
+++ b/drivers/isdn/capi/capifs.c
@@ -11,6 +11,7 @@
 
 #include <linux/fs.h>
 #include <linux/mount.h>
+#include <linux/slab.h>
 #include <linux/namei.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -25,13 +26,10 @@ MODULE_LICENSE("GPL");
 
 /* ------------------------------------------------------------------ */
 
-static char *revision = "$Revision: 1.1.2.3 $";
-
-/* ------------------------------------------------------------------ */
-
 #define CAPIFS_SUPER_MAGIC (('C'<<8)|'N')
 
 static struct vfsmount *capifs_mnt;
+static int capifs_mnt_count;
 
 static struct {
        int setuid;
@@ -140,7 +138,7 @@ static struct file_system_type capifs_fs_type = {
        .kill_sb        = kill_anon_super,
 };
 
-struct dentry *capifs_new_ncci(unsigned int number, dev_t device)
+static struct dentry *new_ncci(unsigned int number, dev_t device)
 {
        struct super_block *s = capifs_mnt->mnt_sb;
        struct dentry *root = s->s_root;
@@ -187,6 +185,20 @@ unlock_out:
        return dentry;
 }
 
+struct dentry *capifs_new_ncci(unsigned int number, dev_t device)
+{
+       struct dentry *dentry;
+
+       if (simple_pin_fs(&capifs_fs_type, &capifs_mnt, &capifs_mnt_count) < 0)
+               return NULL;
+
+       dentry = new_ncci(number, device);
+       if (!dentry)
+               simple_release_fs(&capifs_mnt, &capifs_mnt_count);
+
+       return dentry;
+}
+
 void capifs_free_ncci(struct dentry *dentry)
 {
        struct dentry *root = capifs_mnt->mnt_sb->s_root;
@@ -206,38 +218,18 @@ void capifs_free_ncci(struct dentry *dentry)
        dput(dentry);
 
        mutex_unlock(&root->d_inode->i_mutex);
+
+       simple_release_fs(&capifs_mnt, &capifs_mnt_count);
 }
 
 static int __init capifs_init(void)
 {
-       char rev[32];
-       char *p;
-       int err;
-
-       if ((p = strchr(revision, ':')) != NULL && p[1]) {
-               strlcpy(rev, p + 2, sizeof(rev));
-               if ((p = strchr(rev, '$')) != NULL && p > rev)
-                  *(p-1) = 0;
-       } else
-               strcpy(rev, "1.0");
-
-       err = register_filesystem(&capifs_fs_type);
-       if (!err) {
-               capifs_mnt = kern_mount(&capifs_fs_type);
-               if (IS_ERR(capifs_mnt)) {
-                       err = PTR_ERR(capifs_mnt);
-                       unregister_filesystem(&capifs_fs_type);
-               }
-       }
-       if (!err)
-               printk(KERN_NOTICE "capifs: Rev %s\n", rev);
-       return err;
+       return register_filesystem(&capifs_fs_type);
 }
 
 static void __exit capifs_exit(void)
 {
        unregister_filesystem(&capifs_fs_type);
-       mntput(capifs_mnt);
 }
 
 EXPORT_SYMBOL(capifs_new_ncci);