autofs4: Add d_manage() dentry operation

[deliverable/linux.git] / fs / char_dev.c

diff --git a/fs/char_dev.c b/fs/char_dev.c
index 143d393881cbd86865063649dd9b27773a5dcf57..dca9e5e0f73b2500b1ce4e0d1b722a2d5de999ee 100644 (file)
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -59,7 +59,7 @@ static struct char_device_struct {
 } *chrdevs[CHRDEV_MAJOR_HASH_SIZE];
 
 /* index in the above */
-static inline int major_to_index(int major)
+static inline int major_to_index(unsigned major)
 {
        return major % CHRDEV_MAJOR_HASH_SIZE;
 }
@@ -417,18 +417,6 @@ static int chrdev_open(struct inode *inode, struct file *filp)
        return ret;
 }
 
-int cdev_index(struct inode *inode)
-{
-       int idx;
-       struct kobject *kobj;
-
-       kobj = kobj_lookup(cdev_map, inode->i_rdev, &idx);
-       if (!kobj)
-               return -1;
-       kobject_put(kobj);
-       return idx;
-}
-
 void cd_forget(struct inode *inode)
 {
        spin_lock(&cdev_lock);
@@ -456,6 +444,7 @@ static void cdev_purge(struct cdev *cdev)
  */
 const struct file_operations def_chr_fops = {
        .open = chrdev_open,
+       .llseek = noop_llseek,
 };
 
 static struct kobject *exact_match(dev_t dev, int *part, void *data)
@@ -581,7 +570,6 @@ EXPORT_SYMBOL(cdev_init);
 EXPORT_SYMBOL(cdev_alloc);
 EXPORT_SYMBOL(cdev_del);
 EXPORT_SYMBOL(cdev_add);
-EXPORT_SYMBOL(cdev_index);
 EXPORT_SYMBOL(__register_chrdev);
 EXPORT_SYMBOL(__unregister_chrdev);
 EXPORT_SYMBOL(directly_mappable_cdev_bdi);