rk: revert 20f3d0b+v3.0.66 to v3.0

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

diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 70373bfa20bc4f5da87049c94c7ecd87fa9e0f9b..aa4e570c2cb5007cde5de16b9be07c001d980d68 100644 (file)
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -807,11 +807,6 @@ static int parse_features(struct arg_set *as, struct multipath *m)
        if (!argc)
                return 0;
 
-       if (argc > as->argc) {
-               ti->error = "not enough arguments for features";
-               return -EINVAL;
-       }
-
        do {
                param_name = shift(as);
                argc--;
@@ -1584,12 +1579,6 @@ static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,
 
        spin_unlock_irqrestore(&m->lock, flags);
 
-       /*
-        * Only pass ioctls through if the device sizes match exactly.
-        */
-       if (!r && ti->len != i_size_read(bdev->bd_inode) >> SECTOR_SHIFT)
-               r = scsi_verify_blk_ioctl(NULL, cmd);
-
        return r ? : __blkdev_driver_ioctl(bdev, mode, cmd, arg);
 }