[PATCH] beginning of methods conversion

To keep the size of changesets sane we split the switch by drivers;
to keep the damn thing bisectable we do the following:
	1) rename the affected methods, add ones with correct
prototypes, make (few) callers handle both.  That's this changeset.
	2) for each driver convert to new methods.  *ALL* drivers
are converted in this series.
	3) kill the old (renamed) methods.

Note that it _is_ a flagday; all in-tree drivers are converted and by the
end of this series no trace of old methods remain.  The only reason why
we do that this way is to keep the damn thing bisectable and allow per-driver
debugging if anything goes wrong.

New methods:
	open(bdev, mode)
	release(disk, mode)
	ioctl(bdev, mode, cmd, arg)		/* Called without BKL */
	compat_ioctl(bdev, mode, cmd, arg)
	locked_ioctl(bdev, mode, cmd, arg)	/* Called with BKL, legacy */

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 15 insertions, 3 deletions

diff --git a/fs/block_dev.c b/fs/block_dev.c
index b9022694e9f7..73b6ce47c861 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1033,8 +1033,13 @@ 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->bd_inode, file);
+                                ret = disk->fops->open(bdev, file->f_mode);
                                 if (ret)
                                         goto out_clear;
                         }
@@ -1074,8 +1079,13 @@ 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->bd_inode, file);
+                                ret = bdev->bd_disk->fops->open(bdev, file->f_mode);
                                 if (ret)
                                         goto out_unlock_bdev;
                         }
@@ -1184,8 +1194,10 @@ 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(bd_inode, NULL);
+                        ret = disk->fops->release(disk, 0);
         }
         if (!bdev->bd_openers) {
                 struct module *owner = disk->fops->owner;