Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 263a3df1 authored by Al Viro's avatar Al Viro
Browse files

nbd: use ->compat_ioctl() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 6108209c

drivers/block/nbd.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -827,6 +827,7 @@ static const struct block_device_operations nbd_fops = 
{

{

	.owner =	THIS_MODULE,

	.owner =	THIS_MODULE,

	.ioctl =	nbd_ioctl,

	.ioctl =	nbd_ioctl,

	.compat_ioctl =	nbd_ioctl,

};

};





#if IS_ENABLED(CONFIG_DEBUG_FS)

#if IS_ENABLED(CONFIG_DEBUG_FS)

fs/compat_ioctl.c

+0 −11
Original line number Original line Diff line number Diff line
@@ -1305,12 +1305,6 @@ COMPATIBLE_IOCTL(PCIIOC_CONTROLLER) 
COMPATIBLE_IOCTL(PCIIOC_MMAP_IS_IO)

COMPATIBLE_IOCTL(PCIIOC_MMAP_IS_IO)

COMPATIBLE_IOCTL(PCIIOC_MMAP_IS_MEM)

COMPATIBLE_IOCTL(PCIIOC_MMAP_IS_MEM)

COMPATIBLE_IOCTL(PCIIOC_WRITE_COMBINE)

COMPATIBLE_IOCTL(PCIIOC_WRITE_COMBINE)

/* NBD */

COMPATIBLE_IOCTL(NBD_DO_IT)

COMPATIBLE_IOCTL(NBD_CLEAR_SOCK)

COMPATIBLE_IOCTL(NBD_CLEAR_QUE)

COMPATIBLE_IOCTL(NBD_PRINT_DEBUG)

COMPATIBLE_IOCTL(NBD_DISCONNECT)

/* i2c */

/* i2c */

COMPATIBLE_IOCTL(I2C_SLAVE)

COMPATIBLE_IOCTL(I2C_SLAVE)

COMPATIBLE_IOCTL(I2C_SLAVE_FORCE)

COMPATIBLE_IOCTL(I2C_SLAVE_FORCE)
@@ -1529,11 +1523,6 @@ static long do_ioctl_trans(unsigned int cmd, 
	case KDSKBMETA:

	case KDSKBMETA:

	case KDSKBLED:

	case KDSKBLED:

	case KDSETLED:

	case KDSETLED:

	/* NBD */

	case NBD_SET_SOCK:

	case NBD_SET_BLKSIZE:

	case NBD_SET_SIZE:

	case NBD_SET_SIZE_BLOCKS:

		return vfs_ioctl(file, cmd, arg);

		return vfs_ioctl(file, cmd, arg);

	}

	}