[PATCH] large dev_t - second series (5/15)

	cdevname() killed, there was only one remaining user
(tty_paranoia_check()) and in that case cdevname() was worse
than plain major:minor (basically, it's "you've got corrupted
inode that was supposed to belong to tty device; here's what
I'd found in ->i_rdev")

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 5b4693c5f9907475c33b40f3bf9928273d48696d..83640a923209b905666cc0c613917f84b9ac59c5 100644 (file)
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -181,17 +181,16 @@ inline int tty_paranoia_check(struct tty_struct *tty, struct inode *inode,
                              const char *routine)
 {
 #ifdef TTY_PARANOIA_CHECK
-       static const char badmagic[] = KERN_WARNING
-               "Warning: bad magic number for tty struct (%s) in %s\n";
-       static const char badtty[] = KERN_WARNING
-               "Warning: null TTY for (%s) in %s\n";
-
        if (!tty) {
-               printk(badtty, cdevname(inode->i_rdev), routine);
+               printk(KERN_WARNING
+                       "null TTY for (%d:%d) in %s\n",
+                       imajor(inode), iminor(inode), routine);
                return 1;
        }
        if (tty->magic != TTY_MAGIC) {
-               printk(badmagic, cdevname(inode->i_rdev), routine);
+               printk(KERN_WARNING
+                       "bad magic number for tty struct (%d:%d) in %s\n",
+                       imajor(inode), iminor(inode), routine);
                return 1;
        }
 #endif

diff --git a/fs/char_dev.c b/fs/char_dev.c
index 3c6258c73384382255533862dbd2384c6a4dd15c..e41bf7caa5eeca2987a8514f7be9b7d5db8b4de2 100644 (file)
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -328,27 +328,6 @@ struct file_operations def_chr_fops = {
        .open = chrdev_open,
 };
 
-const char *cdevname(kdev_t dev)
-{
-       static char buffer[40];
-       const char *name = "unknown-char";
-       unsigned int major = major(dev);
-       unsigned int minor = minor(dev);
-       int i = major_to_index(major);
-       struct char_device_struct *cd;
-
-       read_lock(&chrdevs_lock);
-       for (cd = chrdevs[i]; cd; cd = cd->next)
-               if (cd->major == major)
-                       break;
-       if (cd)
-               name = cd->name;
-       sprintf(buffer, "%s(%d,%d)", name, major, minor);
-       read_unlock(&chrdevs_lock);
-
-       return buffer;
-}
-
 static struct kobject *exact_match(dev_t dev, int *part, void *data)
 {
        struct cdev *p = data;

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 87ae270bf96c78305bafb2ff71ab0a7ab4009bd8..fa2bd2dd7600a5e40d6d0b949dca85508d5b71d5 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1156,7 +1156,6 @@ extern struct block_device *lookup_bdev(const char *);
 extern struct block_device *open_bdev_excl(const char *, int, int, void *);
 extern void close_bdev_excl(struct block_device *, int);
 
-extern const char * cdevname(kdev_t);
 extern void init_special_inode(struct inode *, umode_t, dev_t);
 
 /* Invalid inode operations -- fs/bad_inode.c */

diff --git a/kernel/ksyms.c b/kernel/ksyms.c
index e503bd8b034992a8c71bfa7e0bdab8ba5e68800b..9f61a0496c2a7287394a3c0b0c336beb1ae37eb4 100644 (file)
--- a/kernel/ksyms.c
+++ b/kernel/ksyms.c
@@ -511,7 +511,6 @@ EXPORT_SYMBOL(vsnprintf);
 EXPORT_SYMBOL(vsscanf);
 EXPORT_SYMBOL(__bdevname);
 EXPORT_SYMBOL(bdevname);
-EXPORT_SYMBOL(cdevname);
 EXPORT_SYMBOL(simple_strtoull);
 EXPORT_SYMBOL(simple_strtoul);
 EXPORT_SYMBOL(simple_strtol);