Merge branch 'for-linus' of git://neil.brown.name/md

[karo-tx-linux.git] / drivers / md / dm-linear.c

diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c
index 1b29e9136758523edcc8925018fda84056d8be4b..bfa107f59d96fca62f219bff16e3affcf08b5046 100644 (file)
--- a/drivers/md/dm-linear.c
+++ b/drivers/md/dm-linear.c
@@ -110,20 +110,11 @@ static int linear_status(struct dm_target *ti, status_type_t type,
        return 0;
 }
 
-static int linear_ioctl(struct dm_target *ti, struct inode *inode,
-                       struct file *filp, unsigned int cmd,
+static int linear_ioctl(struct dm_target *ti, unsigned int cmd,
                        unsigned long arg)
 {
        struct linear_c *lc = (struct linear_c *) ti->private;
-       struct block_device *bdev = lc->dev->bdev;
-       struct file fake_file = {};
-       struct dentry fake_dentry = {};
-
-       fake_file.f_mode = lc->dev->mode;
-       fake_file.f_path.dentry = &fake_dentry;
-       fake_dentry.d_inode = bdev->bd_inode;
-
-       return blkdev_driver_ioctl(bdev->bd_inode, &fake_file, bdev->bd_disk, cmd, arg);
+       return __blkdev_driver_ioctl(lc->dev->bdev, lc->dev->mode, cmd, arg);
 }
 
 static int linear_merge(struct dm_target *ti, struct bvec_merge_data *bvm,
@@ -151,6 +142,7 @@ static struct target_type linear_target = {
        .status = linear_status,
        .ioctl  = linear_ioctl,
        .merge  = linear_merge,
+       .features = DM_TARGET_SUPPORTS_BARRIERS,
 };
 
 int __init dm_linear_init(void)
@@ -165,8 +157,5 @@ int __init dm_linear_init(void)
 
 void dm_linear_exit(void)
 {
-       int r = dm_unregister_target(&linear_target);
-
-       if (r < 0)
-               DMERR("unregister failed %d", r);
+       dm_unregister_target(&linear_target);
 }