Commit 0000d031 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] dasd: enable compat ioctls 



All of the ioctls are compatible. Just enable them.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 59fa4392

drivers/s390/block/dasd.c

+2 −1
Original line number Diff line number Diff line
@@ -2101,7 +2101,8 @@ dasd_device_operations = { 
	.owner		= THIS_MODULE,

	.open		= dasd_open,

	.release	= dasd_release,

	.locked_ioctl	= dasd_ioctl,

	.ioctl		= dasd_ioctl,

	.compat_ioctl	= dasd_ioctl,

	.getgeo		= dasd_getgeo,

};

drivers/s390/block/dasd_ioctl.c

+14 −3
Original line number Diff line number Diff line
@@ -365,8 +365,8 @@ static int dasd_ioctl_readall_cmb(struct dasd_block *block, unsigned int cmd, 
	return ret;

}



int

dasd_ioctl(struct block_device *bdev, fmode_t mode,

static int

dasd_do_ioctl(struct block_device *bdev, fmode_t mode,

	      unsigned int cmd, unsigned long arg)

{

	struct dasd_block *block = bdev->bd_disk->private_data;
@@ -420,3 +420,14 @@ dasd_ioctl(struct block_device *bdev, fmode_t mode, 
		return -EINVAL;

	}

}



int dasd_ioctl(struct block_device *bdev, fmode_t mode,

	       unsigned int cmd, unsigned long arg)

{

	int rc;



	lock_kernel();

	rc = dasd_do_ioctl(bdev, mode, cmd, arg);

	unlock_kernel();

	return rc;

}