From patchwork Tue Dec 17 22:16:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 181942 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp6382745ile; Tue, 17 Dec 2019 14:18:49 -0800 (PST) X-Google-Smtp-Source: APXvYqyKzIhxRmrAXDJ4kV12EdsZ8uFhIg2L/mN1IGwlsg50CfAIbDQj1jCvZTWQqyy2bLlbvmcn X-Received: by 2002:a9d:6181:: with SMTP id g1mr41231720otk.104.1576621129028; Tue, 17 Dec 2019 14:18:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576621129; cv=none; d=google.com; s=arc-20160816; b=a2gmteSFlqw48tbGS4IWPhq/JVh20YMXoZveNWOcZFpgLb0zV/4Lb3fQCJFo7E+g9z JMepKTd/SqgSaHYhYT1gM2QUE8fzgagu/BMirGLJ7U8OAS37fBY15z0jmoSAhij+rk5u gkvamO9lgKIJqdYkGHemet8mSx/e68uwxCOevkbyOlswQz8vO0Iw6CjfX4EiS6KpzWMK l1i/EzNFdQgwXM+ppiurg77VGw4IcUTws0i8oXtZZigVWf98Cd+TV0I8ehP+lcVMlhem g/019q41/LB+8r3Bp/yi9PQG0owYEqTZ4I19PipH3Yeg0z3oIpIZHlPuZ0Q4jjafPZyR wzhQ== 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=9tp2fJUlv3xK1maF7YMvX2+1r6b+E3Vz9as4dsfMnAE=; b=DRTzFm7lTJX9AFj9tekArh6kVIU2toc5uPprmdzm17CdNDj28kXmJtkgVNOAQjdL+3 5P6ZRBMLsEHNcfeNQEC/p8enHAM1yeLVfrfewT969wmlbezXRXoNKudY0QTSjMK6+ym+ peUo8WhD/NWdO5BAk32zQS0BXeJn0+6bQdQ/DMNDaWnDl8J3qdjaptTEqMs2086On+tO HGkhFbLSO+R/nWWIpZI5mL5qa5oYqLJ+BThW08NY1x1lMRCp//JHbKFBPIeDb1sacK+o dDBBvdJYfSQG8k5Rlh8UKkwMKbxg8A7/As8WfbV+TgWwWaKTAkScM8PYnp8bDJOY6zHW xQGg== 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 s129si7055449oig.177.2019.12.17.14.18.48; Tue, 17 Dec 2019 14:18:49 -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 S1727097AbfLQWSs (ORCPT + 14 others); Tue, 17 Dec 2019 17:18:48 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:47933 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726641AbfLQWRo (ORCPT ); Tue, 17 Dec 2019 17:17:44 -0500 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1MJV5K-1iNTtD2mu8-00JtoE; Tue, 17 Dec 2019 23:17:23 +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, Damien Le Moal Subject: [PATCH v2 02/27] compat_ioctl: block: handle BLKREPORTZONE/BLKRESETZONE Date: Tue, 17 Dec 2019 23:16:43 +0100 Message-Id: <20191217221708.3730997-3-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:g9ac37aU2A7D6GQqud2omy5i2QGTVE1qppkCL5XwIDeUd8bobTc MveRQyw3+9pR5kUrwwKPYkI72gAZcTFNOFPrXHHjoLZDSE//MQTS40wwyPjouH26AbGYVAe jAM7wjF2oIGdwXn7+yQnLwHO5GyBuoGAp+pfHTjpdbXQt7rRjN5nKS181kK7PLyXD7q+Jnk 7vH6FPtRoMkX/848Z91BA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:zG7SE8/0MZM=:KEUrtjVSBoJBU02gLbM6J4 2EagqdafkKPJhjR/Tm0F8ZE1uyWfOhPXtbj8Wi3q3Gozys9rJExO2wo4fo8ZxCs7OxZ1eEZ9J QepdDyiAeclC3QZ/nS2SRQc5KfTpwTH81BOMbRk1pkWO7VBTU+1d7i6HOwYh33TmvPTPsizvs MMVgM2K0tstvZ4ElOoVo5v3o6ev5YpWZCxE8GktYvG0zounkN5I5TObuXVKKerlR6AbILeRZx /SvdM3xC+vzZR3/4WQiVK0BrlEnAgJ7KBwyX6MdtdE4Vvmg6kHUwBOlViwl2zJ9VpG5T9tSMQ ptvWX8OIXgyH32USJldmEISgyLbpyc/eJEzcidHTWP+AeRnZSScA89uCQDZfTfMSjLQK8+D+C OKwhn/bEDCgSv9BBWyaqngtW8TdY26Ab7veXc4nSFkq/LFamorGan0OT77JgAGrbr8TCrZYhS tUPJGutM0iBHjyEkanop9hfxbHlXtYyhsW7onbWfmOTufD/d82/k+BcJLxijM9GtV7irNjQ6R S4AUe9RBV7iJypejiG7xbrn9Ga6alfisodAiti+85iaJubN0gAVQHFirx85oCSZF7amaWoB7G +mTlrAJIOEZZTJxvrpGatRoArgx5Vy27kBC02ny5s8R1qTsSnFQTQfWvl7PfefpvaeIA/i2a0 D6wN5emM0HXJ04BR4P6Rb5hAuUZQbl+72JxXEEg/LLU1GzBkmKmYP3yBes+k1IjkANfSkmKPz SIUNKFKLEMW9a18wGjAEUepv0t21kQ/C1T3JHWUNJ7MndLZoLXEmGzXwk3ZSVBITBQpZm5KOn JLehDsF+wQUW2hMIYQHtMPit53Y2etN3OEtSGjEUcmNbtag1dXyqMvACIelUubtCVGwnnnsOa exU8Q+G3QGndB70dx2Xw== Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org These were added to blkdev_ioctl() but not blkdev_compat_ioctl, so add them now. Cc: # v4.10+ Fixes: 3ed05a987e0f ("blk-zoned: implement ioctls") Reviewed-by: Damien Le Moal Signed-off-by: Arnd Bergmann --- block/compat_ioctl.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.20.0 diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c index 6ca015f92766..830f91e05fe3 100644 --- a/block/compat_ioctl.c +++ b/block/compat_ioctl.c @@ -354,6 +354,8 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) * but we call blkdev_ioctl, which gets the lock for us */ case BLKRRPART: + case BLKREPORTZONE: + case BLKRESETZONE: return blkdev_ioctl(bdev, mode, cmd, (unsigned long)compat_ptr(arg)); case BLKBSZSET_32: From patchwork Tue Dec 17 22:16:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 181931 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp6381453ile; Tue, 17 Dec 2019 14:17:44 -0800 (PST) X-Google-Smtp-Source: APXvYqw6hNdmbh8nP9ZZE+j1qgLBEn5yfekfw0+owW/xgd1ntGtcuAj/ePWxOuoik6W42jIw5osq X-Received: by 2002:a05:6830:20cf:: with SMTP id z15mr40148553otq.277.1576621064631; Tue, 17 Dec 2019 14:17:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576621064; cv=none; d=google.com; s=arc-20160816; b=E+T+SEcGoCg+jNOxvMDN1aMD6M2qCdEo7qAislotGEfjnm7Q7OPq81SiFf0PLGM1ND OHVi2F4mQzadU5Q2E1iOaOsvhady97DS7SBHmYBmzYtEoLLQ1+xRnHvJDtxD/8cE8+UQ IOD2Ayd6EPbmalVrCKBa3eUeFFaZ/o07WB86KxfayAKdFhL3gScHtGlnejyebixXqYIa df7kSp++91SBrL5O9iaSSAj9n573Fb9BteuPRmBkwBI7hEapgW8vrvSTKIX9taWTtB37 rGSkDe9XqTPoK80gABnyri60lEwCXoqLpYc+7fHZIPMU3lrmF7P8p3SnT5fPVTcaPFrF AIkw== 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=g1mlgQ7rLYTJv/GB28NRncwTEXhgRnRGJe3U1vaEeAg=; b=XWkg8Yax6j/Gme9niXV1I+qLhj/iqng82591Y2ySuapyIWpoxetaTAipBasgsvnYOi ls0tlGkDSMUA21H8yiAZBYT4CveZB74nRP08OGk/7GwE49XXaAOif6N5kt+gK+Vp8qlv Tew0XcLAhxUMJZNyZYlDWfCS02xIz8l70AG+zFVP0ArDMRMZI1HjDfz5aTnUHda9HPd9 CTd3CZaBW4IT+jAvKI9WNzL0jIDdRDj6yhIOfLy7HHIs3k2dAWkbaAiHHL7GDmEplN90 8JeEnbFJDxYMv7lQEjgt1NZaQcOoaoM5urINcyXnsGkfxqE8mPyOdUIyW2ZC+HI2gyPY oJAA== 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 s11si11453445otd.123.2019.12.17.14.17.44; Tue, 17 Dec 2019 14:17:44 -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 S1726692AbfLQWRn (ORCPT + 14 others); Tue, 17 Dec 2019 17:17:43 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:47167 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726616AbfLQWRk (ORCPT ); Tue, 17 Dec 2019 17:17:40 -0500 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1N7Qt9-1hc4Aj0to5-017p51; Tue, 17 Dec 2019 23:17:24 +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, Damien Le Moal Subject: [PATCH v2 03/27] compat_ioctl: block: handle BLKGETZONESZ/BLKGETNRZONES Date: Tue, 17 Dec 2019 23:16:44 +0100 Message-Id: <20191217221708.3730997-4-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:qZe5YHLKHLHpHJZclyVZA0fCxWsO2YWO0AhXGovOQ1fZAYHfawL PlgMmuwRjxPbewOZKAHylAsdjtO5Fe/LyB5CoqTBmrCuAd/xJZkTNN2Xe6IE5gl9V6JPzSt wvrf4HNaht3Bulo2IXSq2733GPK1CFCKtmRyV0YYyH/U4G/08T9e4oHS3EjXjMzJqv1R6qu YXpz3kgtPpBQ+l8/25RAg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:Hk6RW/QL2Xc=:a9P9ugAbeQlBAd8QTVyh2z 5InWQgdBINeinSpZATAEdhQ/i9YNLE4Cs+a4GFKgz8jKOPxplXc0dczKp/R69c5g8upJqXc65 Inze+14ZfZRZaI0BopuCyPY5TUVy08obBhggcQi+WudXUEHWwBsXUFluiycvo4Qaurb+6rEtF wl/PyloS7vvgNbHp3oizoL/VE9M/fDRKOZnJVXS33E5tAxmuyEeS+c06bSgvorA2N0WUlGegL JR96X/5oeTYQNiS6LNCZOFNiaK7DxSoFNL2X//sV4r/tkqil9NVYbVqSA57bXb27MZdAlvzce teYoIFLXA6UzJ6tlnlyGnkX0lzqkCqNUxxn2Vz3OLxiBy708VuKvki7fpMwIoFK5zb8uismKl NVnMG3k+kqutWYugmpAYLlsd46sD0BA3aS7H/7sbtwCkJbLmSHzGzUzT3QwFLvufPwS7gjtVa LkVlGEraoHwX6J/Aq5FlQxnpaZCOZaoD2ipgjveEAiRud97oZd3v0U1P+jQVsZ31Vd+ZmWrGT 99AZMqe5M7rDHP9ViRtLfEhibVOQhXjLSW+6xch6lCzJ219MgwF1MnPomwWr/0C9C2kvM0BuW j5FGSpZiAZjCLNLEkmuBo6gIivj9IxCbQPMRAzV5rRkt2cZS6sEc13znh6WL9OTKMbXBlAoEg 92vBK+F5J4ulrPf/6JaQ+KO+dW1b0XoqtMB47HnrBzadfiYpZbvLrSGZ9glboP6AhZN/k8rL7 bCxTfErhrRnqMpnIuouQQawVleSt5C4nvOHsvTHLrT7EfkeC0Orh2YFb1qjgwN0bBoM067VZr rD9N8ZXHsBYH9Hk++YNJRhYpCVImlVrPMX8irVmtJnFkRUa5wg509PSNNIxy3I6lxJmDXGb5E AEnRWMTVaEAGbAC7t4wA== Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org These were added to blkdev_ioctl() in v4.20 but not blkdev_compat_ioctl, so add them now. Cc: # v4.20+ Fixes: 72cd87576d1d ("block: Introduce BLKGETZONESZ ioctl") Fixes: 65e4e3eee83d ("block: Introduce BLKGETNRZONES ioctl") Reviewed-by: Damien Le Moal Signed-off-by: Arnd Bergmann --- block/compat_ioctl.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.20.0 diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c index 830f91e05fe3..f5c1140b8624 100644 --- a/block/compat_ioctl.c +++ b/block/compat_ioctl.c @@ -356,6 +356,8 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) case BLKRRPART: case BLKREPORTZONE: case BLKRESETZONE: + case BLKGETZONESZ: + case BLKGETNRZONES: return blkdev_ioctl(bdev, mode, cmd, (unsigned long)compat_ptr(arg)); case BLKBSZSET_32: 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);