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

Commit fc982b8f authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

compat_ioctl: block: handle Persistent Reservations 



commit b2c0fcd28772f99236d261509bcd242135677965 upstream.

These were added to blkdev_ioctl() in linux-5.5 but not
blkdev_compat_ioctl, so add them now.

Cc: <stable@vger.kernel.org> # v4.4+
Fixes: bbd3e064 ("block: add an API for Persistent Reservations")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

Fold in followup patch from Arnd with missing pr.h header include.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 2f7db098

block/compat_ioctl.c

+9 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/compat.h>

#include <linux/elevator.h>

#include <linux/hdreg.h>

#include <linux/pr.h>

#include <linux/slab.h>

#include <linux/syscalls.h>

#include <linux/types.h>
@@ -401,6 +402,14 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) 
	case BLKTRACETEARDOWN: /* compatible */

		ret = blk_trace_ioctl(bdev, cmd, compat_ptr(arg));

		return ret;

	case IOC_PR_REGISTER:

	case IOC_PR_RESERVE:

	case IOC_PR_RELEASE:

	case IOC_PR_PREEMPT:

	case IOC_PR_PREEMPT_ABORT:

	case IOC_PR_CLEAR:

		return blkdev_ioctl(bdev, mode, cmd,

				(unsigned long)compat_ptr(arg));

	default:

		if (disk->fops->compat_ioctl)

			ret = disk->fops->compat_ioctl(bdev, mode, cmd, arg);