[PATCH] end of methods switch: remove the old ones
[linux-2.6.git] / fs / block_dev.c
index 73b6ce4..55124ac 100644 (file)
@@ -1033,11 +1033,6 @@ static int do_open(struct block_device *bdev, struct file *file, int for_part)
                bdev->bd_contains = bdev;
                if (!partno) {
                        struct backing_dev_info *bdi;
-                       if (disk->fops->__open) {
-                               ret = disk->fops->__open(bdev->bd_inode, file);
-                               if (ret)
-                                       goto out_first;
-                       }
                        if (disk->fops->open) {
                                ret = disk->fops->open(bdev, file->f_mode);
                                if (ret)
@@ -1079,11 +1074,6 @@ static int do_open(struct block_device *bdev, struct file *file, int for_part)
                part = NULL;
                disk = NULL;
                if (bdev->bd_contains == bdev) {
-                       if (bdev->bd_disk->fops->__open) {
-                               ret = bdev->bd_disk->fops->__open(bdev->bd_inode, file);
-                               if (ret)
-                                       goto out;
-                       }
                        if (bdev->bd_disk->fops->open) {
                                ret = bdev->bd_disk->fops->open(bdev, file->f_mode);
                                if (ret)
@@ -1180,7 +1170,6 @@ static int blkdev_open(struct inode * inode, struct file * filp)
 static int __blkdev_put(struct block_device *bdev, int for_part)
 {
        int ret = 0;
-       struct inode *bd_inode = bdev->bd_inode;
        struct gendisk *disk = bdev->bd_disk;
        struct block_device *victim = NULL;
 
@@ -1194,8 +1183,6 @@ static int __blkdev_put(struct block_device *bdev, int for_part)
                kill_bdev(bdev);
        }
        if (bdev->bd_contains == bdev) {
-               if (disk->fops->__release)
-                       ret = disk->fops->__release(bd_inode, NULL);
                if (disk->fops->release)
                        ret = disk->fops->release(disk, 0);
        }