This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / fs / super.c

diff --git a/fs/super.c b/fs/super.c
index 035abec..998fc47 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -32,15 +32,11 @@
 #include <linux/buffer_head.h>         /* for fsync_super() */
 #include <linux/mount.h>
 #include <linux/security.h>
-#include <linux/syscalls.h>
 #include <linux/vfs.h>
 #include <linux/writeback.h>           /* for the emergency remount stuff */
 #include <linux/idr.h>
 #include <linux/devpts_fs.h>
 #include <linux/proc_fs.h>
-#include <linux/kobject.h>
-#include <linux/devpts_fs.h>
-#include <linux/proc_fs.h>
 #include <asm/uaccess.h>
 
 
@@ -661,16 +657,6 @@ static int test_bdev_super(struct super_block *s, void *data)
        return (void *)s->s_bdev == data;
 }
 
-static void bdev_uevent(struct block_device *bdev, enum kobject_action action)
-{
-       if (bdev->bd_disk) {
-               if (bdev->bd_part)
-                       kobject_uevent(&bdev->bd_part->kobj, action, NULL);
-               else
-                       kobject_uevent(&bdev->bd_disk->kobj, action, NULL);
-       }
-}
-
 struct super_block *get_sb_bdev(struct file_system_type *fs_type,
        int flags, const char *dev_name, void *data,
        int (*fill_super)(struct super_block *, void *, int))
@@ -713,10 +699,8 @@ struct super_block *get_sb_bdev(struct file_system_type *fs_type,
                        up_write(&s->s_umount);
                        deactivate_super(s);
                        s = ERR_PTR(error);
-               } else {
+               } else
                        s->s_flags |= MS_ACTIVE;
-                       bdev_uevent(bdev, KOBJ_MOUNT);
-               }
        }
 
        return s;
@@ -731,8 +715,6 @@ EXPORT_SYMBOL(get_sb_bdev);
 void kill_block_super(struct super_block *sb)
 {
        struct block_device *bdev = sb->s_bdev;
-
-       bdev_uevent(bdev, KOBJ_UMOUNT);
        generic_shutdown_super(sb);
        set_blocksize(bdev, sb->s_old_blocksize);
        close_bdev_excl(bdev);