block: use extensible_ioctl_valid()

Use the new extensible_ioctl_valid() helper which is equivalent to what
is done here.

Reviewed-by: Jens Axboe <axboe@kernel.dk>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index 056b8948369d55b135e52a0391043c1e47459de7..ce08ad4565e2837444098bf7baa0d5ec864d1314 100644 (file)
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -58,16 +58,14 @@ new_segment:
 int blk_get_meta_cap(struct block_device *bdev, unsigned int cmd,
                     struct logical_block_metadata_cap __user *argp)
 {
-       struct blk_integrity *bi = blk_get_integrity(bdev->bd_disk);
+       struct blk_integrity *bi;
        struct logical_block_metadata_cap meta_cap = {};
        size_t usize = _IOC_SIZE(cmd);
 
-       if (_IOC_DIR(cmd)  != _IOC_DIR(FS_IOC_GETLBMD_CAP) ||
-           _IOC_TYPE(cmd) != _IOC_TYPE(FS_IOC_GETLBMD_CAP) ||
-           _IOC_NR(cmd)   != _IOC_NR(FS_IOC_GETLBMD_CAP) ||
-           _IOC_SIZE(cmd) < LBMD_SIZE_VER0)
+       if (!extensible_ioctl_valid(cmd, FS_IOC_GETLBMD_CAP, LBMD_SIZE_VER0))
                return -ENOIOCTLCMD;
 
+       bi = blk_get_integrity(bdev->bd_disk);
        if (!bi)
                goto out;