From patchwork Tue Dec 17 22:16:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 181930 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp6381366ile; Tue, 17 Dec 2019 14:17:40 -0800 (PST) X-Google-Smtp-Source: APXvYqzecX5G+CxkNOdPuNB78qprNKkCj8gM4fSAT2xWLwN+qZcrYd13nszE1cSJdiUKXYvrdVoc X-Received: by 2002:a05:6830:1e61:: with SMTP id m1mr40317027otr.68.1576621060313; Tue, 17 Dec 2019 14:17:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576621060; cv=none; d=google.com; s=arc-20160816; b=juIytc9lLwmvi7QSx8dhwkqlwnoOUNSgrsx0IiBak+/Io+FHxnK6ER0j8/ed9IxOOx wJIdYVwQnRzspBK+TpXA7Ava6w6d/mAvnMyTiRGQR4Wl4iR4e9YTHCWKWImE4ObKhrIC SvbPMxUwAhP/fUqNnV93Ig6IUInjsg4ODbpABRi4Meb/Y2X6JlouhFKElo2x2vg5IVvd 4tXiVMCvSFVFl850JH+SYu1K7y0FU1c5IG6T29KcpIKX/LqYMxEwgIeAikudPEr2cKGk hcJjSwsVBzVCMSpYNVv50bgq8yD5d4SlIF7haN/jv568ZYEt7hUnjLJoqvP+9CN6wLQK C/6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=YpKmobFYt+kMB923srnVV+v+jag87t3BW6FRqyC7c7Q=; b=mx7FfLZtGGKHBl9PCljtPiqq8FqKgQNpBcu67dQlnC5w/DF6bekDSlrE6I5XwlwKa0 CY6Jhhsf7dpYGrpxORyyMmlEvmLdqxGTN2bVxq0CnfhRaVQYn7u+19JG35IGohm5TzFE x3TOsPSDiSmkhK6RY/Rjfk5ZkMc2b78ZXDVWpYIxcQ1WZUhFLsmVw/He3pifWzv1mOyi R96gNANYnUQafaC2k+i3btbGy8KI6fvSSGwi1IsiD/iK9slkQODrhthEFhG/NOhBlJ9k ajEFqKHFxSypv/q4fGFsfD/pcOQe/2N+MlhVIVSnoEfoCC/C6unZgBd8Dh5YdsXm9w2S eVQw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c12si12710733otf.18.2019.12.17.14.17.40; Tue, 17 Dec 2019 14:17:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726609AbfLQWRj (ORCPT + 14 others); Tue, 17 Dec 2019 17:17:39 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:45633 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726539AbfLQWRh (ORCPT ); Tue, 17 Dec 2019 17:17:37 -0500 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1MWiUg-1iAIaz11AG-00X7Da; Tue, 17 Dec 2019 23:17:25 +0100 From: Arnd Bergmann To: Jens Axboe , "James E.J. Bottomley" , "Martin K. Petersen" Cc: linux-scsi@vger.kernel.org, linux-block@vger.kernel.org, y2038@lists.linaro.org, linux-kernel@vger.kernel.org, Christoph Hellwig , Ben Hutchings , linux-doc@vger.kernel.org, corbet@lwn.net, viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, Arnd Bergmann , stable@vger.kernel.org Subject: [PATCH v2 05/27] compat_ioctl: block: handle Persistent Reservations Date: Tue, 17 Dec 2019 23:16:46 +0100 Message-Id: <20191217221708.3730997-6-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20191217221708.3730997-1-arnd@arndb.de> References: <20191217221708.3730997-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:tx22KhkD8iJEZwgYOFJOPlY7/tV41LHYXsZyhEEBtPVUvOD6tZ9 4vPV9N8E62lgxAxzbfK8VDbGilQv+sX1qrJOYnivJO3Kx7yLG1YXPA9d3OSBQ2Up50TY2P5 E+6JBT8vWfcZROysq2+gDwTDnZCBZvKYpKY5KsUZKiWLRhBcIt0dDmgK7tehattqwqXno49 vXnJSOt2f4OGkue9fXHKg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:7CYFyHsACKo=:iyqLTw2Ohx2BEyJYsY+41B hmwCpRKunMUl5x4CJcPTcGVIU5H44ivCnbINJS9mY+fwQyDURv9WqnbJ8BKVg9OfGh0zuhGuJ E410up0th9p7KZUbMj7TMBh2DwGyF4mvvWKAA5o6lXrfK9JoZrSfUsB5nPW7mNINFtgCVK6q+ C5ho2O5/A5yBtAUmN64W+FrC+/fHoVI0GCjzmZ6hlEzFvDX5SbIAtIxjC99izWWjugaLMyX6N 27qHiPIxK/4sFWFthVGVDijLh8GaQYnfJ/KuesQ+l4IAmo6vDORhk33l5yV66TpT/RIFdEAf0 4x73Z8R6U0zssgg8ECCn3uS0Fp1eZtEiueO2/ZWjZah8FHdlpK6HJFTKGGrCacMXpnFZ+/X0P frWn1az7Dzraw9EtnxDoi208ZXqwffjTDOJX33eDDBpr5XMkE6MOJFeE9QC1vRdQ16xzDDQYy NVuLk3W10H+rnGj5kUVvcfLF5ltPJe/sSH2SKVMSYf+LFg4scM+8xOpJO/ItnkAlPLFKydGy4 kd/OLhf8xRqcbJsgkt9/YxeY59pHHB3USKVHP23C9YP7Q1U+eDd55rOLPsnyfrZ8dfv6EfKuu snRrXg6PaLYh5gnyjsinoeAx2aHPbOYfK5WRUA2j6S2SFX4CJUyC9Ztk3ehYK/ifB9EmYjWhz 6MbLS+22UGdPgqIbcwauE98Q+zazJtoPwRXc0cP9elqDfdSx2iN5iRhOuNIqEUwyIQLcaLens EgMCvwj72YNusvtNS/E1eqcJffNdTWGYofCMPbJZwajFRs3blHACkQPD0KHiboA0h9T3umrqT sEUgKmBzCLZSmf2JYy9Ni4gBWr1RoTw3UHhLFcRICibhg0pKZlgplQlOZ3nROO28SseqNcmVL O9es2vmgaCJxzqdKwRsw== Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org These were added to blkdev_ioctl() in linux-5.5 but not blkdev_compat_ioctl, so add them now. Cc: # v4.4+ Fixes: bbd3e064362e ("block: add an API for Persistent Reservations") Signed-off-by: Arnd Bergmann --- block/compat_ioctl.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.20.0 diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c index 5b13e344229c..f16ae92065d7 100644 --- a/block/compat_ioctl.c +++ b/block/compat_ioctl.c @@ -408,6 +408,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);