linux-stable.git/block/ioctl.c, branch v5.8

block: Fix type of first compat_put_{,u}long() argument

2020-05-19T15:40:29+00:00

This patch fixes the following sparse warnings:

block/ioctl.c:209:16: warning: incorrect type in argument 1 (different address spaces)
block/ioctl.c:209:16:    expected void const volatile [noderef]  *
block/ioctl.c:209:16:    got signed int [usertype] *argp
block/ioctl.c:214:16: warning: incorrect type in argument 1 (different address spaces)
block/ioctl.c:214:16:    expected void const volatile [noderef]  *
block/ioctl.c:214:16:    got unsigned int [usertype] *argp
block/ioctl.c:666:40: warning: incorrect type in argument 1 (different address spaces)
block/ioctl.c:666:40:    expected signed int [usertype] *argp
block/ioctl.c:666:40:    got void [noderef]  *argp
block/ioctl.c:672:41: warning: incorrect type in argument 1 (different address spaces)
block/ioctl.c:672:41:    expected unsigned int [usertype] *argp
block/ioctl.c:672:41:    got void [noderef]  *argp

Fixes: 9b81648cb5e3 ("compat_ioctl: simplify up block/ioctl.c")
Signed-off-by: Bart Van Assche 
Reviewed-by: Christoph Hellwig 
Acked-by: Arnd Bergmann 
Cc: Arnd Bergmann 
Signed-off-by: Jens Axboe

block: refactor blkpg_ioctl

2020-04-20T17:32:59+00:00

Split each sub-command out into a separate helper, and move those helpers
to block/partitions/core.c instead of having a lot of partition
manipulation logic open coded in block/ioctl.c.

Signed-off-by: Christoph Hellwig

block: move block layer internals out of include/linux/genhd.h

2020-03-25T15:50:08+00:00

None of this needs to be exposed to drivers.

Signed-off-by: Christoph Hellwig 
Signed-off-by: Jens Axboe

compat_ioctl: simplify up block/ioctl.c

2020-01-03T08:42:52+00:00

Having separate implementations of blkdev_ioctl() often leads to these
getting out of sync, despite the comment at the top.

Since most of the ioctl commands are compatible, and we try very hard
not to add any new incompatible ones, move all the common bits into a
shared function and leave only the ones that are historically different
in separate functions for native/compat mode.

To deal with the compat_ptr() conversion, pass both the integer
argument and the pointer argument into the new blkdev_common_ioctl()
and make sure to always use the correct one of these.

blkdev_ioctl() is now only kept as a separate exported interfact
for drivers/char/raw.c, which lacks a compat_ioctl variant.
We should probably either move raw.c to staging if there are no
more users, or export blkdev_compat_ioctl() as well.

Reviewed-by: Ben Hutchings 
Signed-off-by: Arnd Bergmann

compat_ioctl: block: simplify compat_blkpg_ioctl()

2020-01-03T08:42:52+00:00

There is no need to go through a compat_alloc_user_space()
copy any more, just wrap the function in a small helper that
works the same way for native and compat mode.

Reviewed-by: Ben Hutchings 
Signed-off-by: Arnd Bergmann

compat_ioctl: block: move blkdev_compat_ioctl() into ioctl.c

2020-01-03T08:42:52+00:00

Having both in the same file allows a number of simplifications
to the compat path, and makes it more likely that changes to
the native path get applied to the compat version as well.

Reviewed-by: Ben Hutchings 
Signed-off-by: Arnd Bergmann

compat_ioctl: block: add blkdev_compat_ptr_ioctl

2020-01-03T08:32:59+00:00

A lot of block drivers need only a trivial .compat_ioctl callback.

Add a helper function that can be set as the callback pointer
to only convert the argument using the compat_ptr() conversion
and otherwise assume all input and output data is compatible,
or handled using in_compat_syscall() checks.

This mirrors the compat_ptr_ioctl() helper function used in
character devices.

Reviewed-by: Ben Hutchings 
Signed-off-by: Arnd Bergmann

block: simplify blkdev_nr_zones

2019-12-03T15:51:24+00:00

Simplify the arguments to blkdev_nr_zones by passing a gendisk instead
of the block_device and capacity.  This also removes the need for
__blkdev_nr_zones as all callers are outside the fast path and can
deal with the additional branch.

Signed-off-by: Christoph Hellwig 
Signed-off-by: Jens Axboe

block: remove (__)blkdev_reread_part as an exported API

2019-11-14T14:43:59+00:00

In general drivers should never mess with partition tables directly.
Unfortunately s390 and loop do for somewhat historic reasons, but they
can use bdev_disk_changed directly instead when we export it as they
satisfy the sanity checks we have in __blkdev_reread_part.

Signed-off-by: Christoph Hellwig 
Reviewed-by: Stefan Haberland 	[dasd]
Reviewed-by: Jan Kara 
Signed-off-by: Jens Axboe

block: fix bdev_disk_changed for non-partitioned devices

2019-11-14T14:43:53+00:00

We still have to set the capacity to 0 if invalidating or call
revalidate_disk if not even if the disk has no partitions.  Fix
that by merging rescan_partitions into bdev_disk_changed and just
stubbing out blk_add_partitions and blk_drop_partitions for
non-partitioned devices.

Signed-off-by: Christoph Hellwig 
Reviewed-by: Jan Kara 
Signed-off-by: Jens Axboe