capi: Perform scheduled capifs removal
authorJan Kiszka <jan.kiszka@web.de>
Wed, 6 Apr 2011 10:58:37 +0000 (10:58 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Apr 2011 21:43:33 +0000 (14:43 -0700)
udev fully replaces this special file system that only contains CAPI
NCCI TTY device nodes. User space (pppdcapiplugin) works without
noticing the difference.

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Documentation/feature-removal-schedule.txt
drivers/isdn/capi/Kconfig
drivers/isdn/capi/Makefile
drivers/isdn/capi/capi.c
drivers/isdn/capi/capifs.c [deleted file]
drivers/isdn/capi/capifs.h [deleted file]

index 274b32d..e38ccae 100644 (file)
@@ -425,16 +425,6 @@ Who:       anybody or Florian Mickler <florian@mickler.org>
 
 ----------------------------
 
-What:  capifs
-When:  February 2011
-Files: drivers/isdn/capi/capifs.*
-Why:   udev fully replaces this special file system that only contains CAPI
-       NCCI TTY device nodes. User space (pppdcapiplugin) works without
-       noticing the difference.
-Who:   Jan Kiszka <jan.kiszka@web.de>
-
-----------------------------
-
 What:  KVM paravirt mmu host support
 When:  January 2011
 Why:   The paravirt mmu host support is slower than non-paravirt mmu, both
index a168e8a..15c3ffd 100644 (file)
@@ -33,21 +33,6 @@ config ISDN_CAPI_CAPI20
          standardized libcapi20 to access this functionality.  You should say
          Y/M here.
 
-config ISDN_CAPI_CAPIFS_BOOL
-       bool "CAPI2.0 filesystem support (DEPRECATED)"
-       depends on ISDN_CAPI_MIDDLEWARE && ISDN_CAPI_CAPI20
-       help
-         This option provides a special file system, similar to /dev/pts with
-         device nodes for the special ttys established by using the
-         middleware extension above.
-         You no longer need this, udev fully replaces it. This feature is
-         scheduled for removal.
-
-config ISDN_CAPI_CAPIFS
-       tristate
-       depends on ISDN_CAPI_CAPIFS_BOOL
-       default ISDN_CAPI_CAPI20
-
 config ISDN_CAPI_CAPIDRV
        tristate "CAPI2.0 capidrv interface support"
        depends on ISDN_I4L
index 57123e3..4d5b4b7 100644 (file)
@@ -7,7 +7,6 @@
 obj-$(CONFIG_ISDN_CAPI)                        += kernelcapi.o
 obj-$(CONFIG_ISDN_CAPI_CAPI20)         += capi.o 
 obj-$(CONFIG_ISDN_CAPI_CAPIDRV)                += capidrv.o
-obj-$(CONFIG_ISDN_CAPI_CAPIFS)         += capifs.o
 
 # Multipart objects.
 
index 0d70883..bea1009 100644 (file)
@@ -38,8 +38,6 @@
 #include <linux/isdn/capiutil.h>
 #include <linux/isdn/capicmd.h>
 
-#include "capifs.h"
-
 MODULE_DESCRIPTION("CAPI4Linux: Userspace /dev/capi20 interface");
 MODULE_AUTHOR("Carsten Paeth");
 MODULE_LICENSE("GPL");
@@ -85,7 +83,6 @@ struct capiminor {
        struct kref kref;
 
        unsigned int      minor;
-       struct dentry *capifs_dentry;
 
        struct capi20_appl      *ap;
        u32                     ncci;
@@ -300,17 +297,8 @@ static void capiminor_free(struct capiminor *mp)
 
 static void capincci_alloc_minor(struct capidev *cdev, struct capincci *np)
 {
-       struct capiminor *mp;
-       dev_t device;
-
-       if (!(cdev->userflags & CAPIFLAG_HIGHJACKING))
-               return;
-
-       mp = np->minorp = capiminor_alloc(&cdev->ap, np->ncci);
-       if (mp) {
-               device = MKDEV(capinc_tty_driver->major, mp->minor);
-               mp->capifs_dentry = capifs_new_ncci(mp->minor, device);
-       }
+       if (cdev->userflags & CAPIFLAG_HIGHJACKING)
+               np->minorp = capiminor_alloc(&cdev->ap, np->ncci);
 }
 
 static void capincci_free_minor(struct capincci *np)
@@ -319,8 +307,6 @@ static void capincci_free_minor(struct capincci *np)
        struct tty_struct *tty;
 
        if (mp) {
-               capifs_free_ncci(mp->capifs_dentry);
-
                tty = tty_port_tty_get(&mp->port);
                if (tty) {
                        tty_vhangup(tty);
@@ -1514,10 +1500,8 @@ static int __init capi_init(void)
 
        proc_init();
 
-#if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
-        compileinfo = " (middleware+capifs)";
-#elif defined(CONFIG_ISDN_CAPI_MIDDLEWARE)
-        compileinfo = " (no capifs)";
+#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
+        compileinfo = " (middleware)";
 #else
         compileinfo = " (no middleware)";
 #endif
diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c
deleted file mode 100644 (file)
index b4faed7..0000000
+++ /dev/null
@@ -1,239 +0,0 @@
-/* $Id: capifs.c,v 1.1.2.3 2004/01/16 21:09:26 keil Exp $
- * 
- * Copyright 2000 by Carsten Paeth <calle@calle.de>
- *
- * Heavily based on devpts filesystem from H. Peter Anvin
- * 
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- */
-
-#include <linux/fs.h>
-#include <linux/mount.h>
-#include <linux/slab.h>
-#include <linux/namei.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/ctype.h>
-#include <linux/sched.h>       /* current */
-
-#include "capifs.h"
-
-MODULE_DESCRIPTION("CAPI4Linux: /dev/capi/ filesystem");
-MODULE_AUTHOR("Carsten Paeth");
-MODULE_LICENSE("GPL");
-
-/* ------------------------------------------------------------------ */
-
-#define CAPIFS_SUPER_MAGIC (('C'<<8)|'N')
-
-static struct vfsmount *capifs_mnt;
-static int capifs_mnt_count;
-
-static struct {
-       int setuid;
-       int setgid;
-       uid_t   uid;
-       gid_t   gid;
-       umode_t mode;
-} config = {.mode = 0600};
-
-/* ------------------------------------------------------------------ */
-
-static int capifs_remount(struct super_block *s, int *flags, char *data)
-{
-       int setuid = 0;
-       int setgid = 0;
-       uid_t uid = 0;
-       gid_t gid = 0;
-       umode_t mode = 0600;
-       char *this_char;
-       char *new_opt = kstrdup(data, GFP_KERNEL);
-
-       this_char = NULL;
-       while ((this_char = strsep(&data, ",")) != NULL) {
-               int n;
-               char dummy;
-               if (!*this_char)
-                       continue;
-               if (sscanf(this_char, "uid=%i%c", &n, &dummy) == 1) {
-                       setuid = 1;
-                       uid = n;
-               } else if (sscanf(this_char, "gid=%i%c", &n, &dummy) == 1) {
-                       setgid = 1;
-                       gid = n;
-               } else if (sscanf(this_char, "mode=%o%c", &n, &dummy) == 1)
-                       mode = n & ~S_IFMT;
-               else {
-                       kfree(new_opt);
-                       printk("capifs: called with bogus options\n");
-                       return -EINVAL;
-               }
-       }
-
-       mutex_lock(&s->s_root->d_inode->i_mutex);
-
-       replace_mount_options(s, new_opt);
-       config.setuid  = setuid;
-       config.setgid  = setgid;
-       config.uid     = uid;
-       config.gid     = gid;
-       config.mode    = mode;
-
-       mutex_unlock(&s->s_root->d_inode->i_mutex);
-
-       return 0;
-}
-
-static const struct super_operations capifs_sops =
-{
-       .statfs         = simple_statfs,
-       .remount_fs     = capifs_remount,
-       .show_options   = generic_show_options,
-};
-
-
-static int
-capifs_fill_super(struct super_block *s, void *data, int silent)
-{
-       struct inode * inode;
-
-       s->s_blocksize = 1024;
-       s->s_blocksize_bits = 10;
-       s->s_magic = CAPIFS_SUPER_MAGIC;
-       s->s_op = &capifs_sops;
-       s->s_time_gran = 1;
-
-       inode = new_inode(s);
-       if (!inode)
-               goto fail;
-       inode->i_ino = 1;
-       inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
-       inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
-       inode->i_op = &simple_dir_inode_operations;
-       inode->i_fop = &simple_dir_operations;
-       inode->i_nlink = 2;
-
-       s->s_root = d_alloc_root(inode);
-       if (s->s_root)
-               return 0;
-       
-       printk("capifs: get root dentry failed\n");
-       iput(inode);
-fail:
-       return -ENOMEM;
-}
-
-static struct dentry *capifs_mount(struct file_system_type *fs_type,
-       int flags, const char *dev_name, void *data)
-{
-       return mount_single(fs_type, flags, data, capifs_fill_super);
-}
-
-static struct file_system_type capifs_fs_type = {
-       .owner          = THIS_MODULE,
-       .name           = "capifs",
-       .mount          = capifs_mount,
-       .kill_sb        = kill_anon_super,
-};
-
-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;
-       struct dentry *dentry;
-       struct inode *inode;
-       char name[10];
-       int namelen;
-
-       mutex_lock(&root->d_inode->i_mutex);
-
-       namelen = sprintf(name, "%d", number);
-       dentry = lookup_one_len(name, root, namelen);
-       if (IS_ERR(dentry)) {
-               dentry = NULL;
-               goto unlock_out;
-       }
-
-       if (dentry->d_inode) {
-               dput(dentry);
-               dentry = NULL;
-               goto unlock_out;
-       }
-
-       inode = new_inode(s);
-       if (!inode) {
-               dput(dentry);
-               dentry = NULL;
-               goto unlock_out;
-       }
-
-       /* config contents is protected by root's i_mutex */
-       inode->i_uid = config.setuid ? config.uid : current_fsuid();
-       inode->i_gid = config.setgid ? config.gid : current_fsgid();
-       inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
-       inode->i_ino = number + 2;
-       init_special_inode(inode, S_IFCHR|config.mode, device);
-
-       d_instantiate(dentry, inode);
-       dget(dentry);
-
-unlock_out:
-       mutex_unlock(&root->d_inode->i_mutex);
-
-       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;
-       struct inode *inode;
-
-       if (!dentry)
-               return;
-
-       mutex_lock(&root->d_inode->i_mutex);
-
-       inode = dentry->d_inode;
-       if (inode) {
-               drop_nlink(inode);
-               d_delete(dentry);
-               dput(dentry);
-       }
-       dput(dentry);
-
-       mutex_unlock(&root->d_inode->i_mutex);
-
-       simple_release_fs(&capifs_mnt, &capifs_mnt_count);
-}
-
-static int __init capifs_init(void)
-{
-       return register_filesystem(&capifs_fs_type);
-}
-
-static void __exit capifs_exit(void)
-{
-       unregister_filesystem(&capifs_fs_type);
-}
-
-EXPORT_SYMBOL(capifs_new_ncci);
-EXPORT_SYMBOL(capifs_free_ncci);
-
-module_init(capifs_init);
-module_exit(capifs_exit);
diff --git a/drivers/isdn/capi/capifs.h b/drivers/isdn/capi/capifs.h
deleted file mode 100644 (file)
index e193d11..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $Id: capifs.h,v 1.1.2.2 2004/01/16 21:09:26 keil Exp $
- * 
- * Copyright 2000 by Carsten Paeth <calle@calle.de>
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- *
- */
-
-#include <linux/dcache.h>
-
-#if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE)
-
-struct dentry *capifs_new_ncci(unsigned int num, dev_t device);
-void capifs_free_ncci(struct dentry *dentry);
-
-#else
-
-static inline struct dentry *capifs_new_ncci(unsigned int num, dev_t device)
-{
-       return NULL;
-}
-
-static inline void capifs_free_ncci(struct dentry *dentry)
-{
-}
-
-#endif