Merge tag 'block-5.10-2020-10-12' of git://git.kernel.dk/linux-block

[linux-2.6-block.git] / drivers / ide / ide-ioctls.c

diff --git a/drivers/ide/ide-ioctls.c b/drivers/ide/ide-ioctls.c
index 09491098047bffaf430f17b5b6979c0a88ee905d..58994da10c0664371ac158a49e8944b3d3c6c5a8 100644 (file)
--- a/drivers/ide/ide-ioctls.c
+++ b/drivers/ide/ide-ioctls.c
@@ -49,7 +49,7 @@ read_val:
        return err >= 0 ? put_user_long(err, arg) : err;
 
 set_val:
-       if (bdev != bdev->bd_contains)
+       if (bdev_is_partition(bdev))
                err = -EINVAL;
        else {
                if (!capable(CAP_SYS_ADMIN))
@@ -257,7 +257,7 @@ int generic_ide_ioctl(ide_drive_t *drive, struct block_device *bdev,
        switch (cmd) {
        case HDIO_OBSOLETE_IDENTITY:
        case HDIO_GET_IDENTITY:
-               if (bdev != bdev->bd_contains)
+               if (bdev_is_partition(bdev))
                        return -EINVAL;
                return ide_get_identity_ioctl(drive, cmd, argp);
        case HDIO_GET_NICE: