Skip to content

Commit

Permalink
compat_ioctl: block: handle Persistent Reservations
Browse files Browse the repository at this point in the history
These were added to blkdev_ioctl() in linux-5.5 but not
blkdev_compat_ioctl, so add them now.

Cc: <[email protected]> # v4.4+
Fixes: bbd3e06 ("block: add an API for Persistent Reservations")
Signed-off-by: Arnd Bergmann <[email protected]>

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

Signed-off-by: Jens Axboe <[email protected]>
  • Loading branch information
arndb authored and axboe committed Dec 21, 2019
1 parent 4b43f31 commit b2c0fcd
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions block/compat_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -408,6 +409,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);
Expand Down

0 comments on commit b2c0fcd

Please sign in to comment.