usb: dwc3: fix logical errors and improve stability for rockchip platform

[firefly-linux-kernel-4.4.55.git] / drivers / md / dm-linear.c

diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c
index 436f5c9b6aea56dd6652696cc3eac489690c1e8e..05c35aacb3aaeadb4cfddd73a14fed73a7c1bbe0 100644 (file)
--- a/drivers/md/dm-linear.c
+++ b/drivers/md/dm-linear.c
@@ -39,20 +39,20 @@ static int linear_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
        lc = kmalloc(sizeof(*lc), GFP_KERNEL);
        if (lc == NULL) {
-               ti->error = "dm-linear: Cannot allocate linear context";
+               ti->error = "Cannot allocate linear context";
                return -ENOMEM;
        }
 
        ret = -EINVAL;
        if (sscanf(argv[1], "%llu%c", &tmp, &dummy) != 1) {
-               ti->error = "dm-linear: Invalid device sector";
+               ti->error = "Invalid device sector";
                goto bad;
        }
        lc->start = tmp;
 
        ret = dm_get_device(ti, argv[0], dm_table_get_mode(ti->table), &lc->dev);
        if (ret) {
-               ti->error = "dm-linear: Device lookup failed";
+               ti->error = "Device lookup failed";
                goto bad;
        }
 
@@ -116,21 +116,21 @@ static void linear_status(struct dm_target *ti, status_type_t type,
        }
 }
 
-static int linear_ioctl(struct dm_target *ti, unsigned int cmd,
-                       unsigned long arg)
+static int linear_prepare_ioctl(struct dm_target *ti,
+               struct block_device **bdev, fmode_t *mode)
 {
        struct linear_c *lc = (struct linear_c *) ti->private;
        struct dm_dev *dev = lc->dev;
-       int r = 0;
+
+       *bdev = dev->bdev;
 
        /*
         * Only pass ioctls through if the device sizes match exactly.
         */
        if (lc->start ||
            ti->len != i_size_read(dev->bdev->bd_inode) >> SECTOR_SHIFT)
-               r = scsi_verify_blk_ioctl(NULL, cmd);
-
-       return r ? : __blkdev_driver_ioctl(dev->bdev, dev->mode, cmd, arg);
+               return 1;
+       return 0;
 }
 
 static int linear_iterate_devices(struct dm_target *ti,
@@ -149,7 +149,7 @@ static struct target_type linear_target = {
        .dtr    = linear_dtr,
        .map    = linear_map,
        .status = linear_status,
-       .ioctl  = linear_ioctl,
+       .prepare_ioctl = linear_prepare_ioctl,
        .iterate_devices = linear_iterate_devices,
 };