From patchwork Wed Aug 14 20:42:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 171357 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1310881ily; Wed, 14 Aug 2019 13:44:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqwtFouPHhShxrlNXIAe3t627mI1ZTxx5aVSu8hwuG2NpjLhZ8itj/026hpO8KLM+xTXpozU X-Received: by 2002:a62:f247:: with SMTP id y7mr1877948pfl.236.1565815452117; Wed, 14 Aug 2019 13:44:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565815452; cv=none; d=google.com; s=arc-20160816; b=wgRfhb3lkW7cYsQoZrlHEm9LAfEwL7ee4pxU0LVPPZcjhil3aErh9iG31bc6Y9j8Pc qglxR1EtyknrlrxAgFxPq4N3JLsPpgzAKDYZI0DmqSlg3616PlsKNEHltiPjSKOS0ulu SQuqLSzmSVS1p5y+F4e3ssUXn1Dxw0Em1L1sg3iWgpsfnf+ulx3wPZbpFFnXcx9Z9QyS DbHOELzJlxpHzH24kuqEQRfFeNmf8l9bifQUDFtw9MzC6usgMQ2rzU02BBCwfVbjOfba dXJNhAvbQYmhK9e3P+PNghvxVB1Mj2BD+vQJ3mXvjZzgjTAcynUVW9DQGF0hgqSW78Bi 1jMg== 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=TwGdjvuB1WjLLp/y9kGPMqLV/aFjnYXoRwTJeMIVz5k=; b=DK7EZtrLpUOvL5oHRIxRTqrliez9ZJ7mT72JQduCqYJzHvAiyZ9XTxy8hFDhBzvn6i Z0M80I+sHhYU7WG6TX9w43yia2CE6LaSNq27LHnhEB60UPW2/Q8Pw7UUlp9m/662L/+s mnhT7HgIAbNa5cD9y5+hdzIxrQrEIbM6hNBQbH6nJdulWEBULdHW5IyMOnbtUUlsPQ7O LBLnOQa3ycqKHbDJrb5RDRu9dvoB9CvH4qezINJezrUG+NzV+WfZ2FuJVL6eYpvUvdvx 55HSstw+oQTSZ6HYt5Db53tOU3dEiidlCLpN7P8CAXVEzUREG0oD5UL69ed3ZGw34D+p uy7g== 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 b6si550370pla.196.2019.08.14.13.44.11; Wed, 14 Aug 2019 13:44:12 -0700 (PDT) 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 S1728775AbfHNUoL (ORCPT + 14 others); Wed, 14 Aug 2019 16:44:11 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:48999 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727414AbfHNUoL (ORCPT ); Wed, 14 Aug 2019 16:44:11 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.129]) with ESMTPA (Nemesis) id 1M7sUE-1hu8FB2YJ0-0055JL; Wed, 14 Aug 2019 22:43:59 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, "Darrick J. Wong" , linux-xfs@vger.kernel.org Cc: Arnd Bergmann , stable@vger.kernel.org, Eric Sandeen , Brian Foster , Nick Bowler , Allison Collins , Eric Sandeen , Dave Chinner Subject: [PATCH v5 02/18] xfs: compat_ioctl: add missing conversions Date: Wed, 14 Aug 2019 22:42:29 +0200 Message-Id: <20190814204259.120942-3-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190814204259.120942-1-arnd@arndb.de> References: <20190814204259.120942-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:BLux4Grpb9eaMSbIUHaQDxbpUbrvASwJg7DjSBmbDM1mEh+OQSl G5n/FRAlhpcI0Sn7b9m1K0M1bvF39TcpRlT3CSGFl7+bY+KEO6/rjDcP9KSqU+5SOAFZN1u Ui5FCJaccug7SCmAt9JgOshsonVvlK697uQkOLkrX2ItPyAMgMpdRzWF2sTnSwRy6q9IT+B vD7ThUPi2YJlmDVS6BIww== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:j12Xhrp5sIs=:AcxvEsaYOH6PkuvTGntmR9 rBstK/TIT+tpcug7Gtvy3sx8T18TYIS1QNsHzsO7opM4MdvAyRQ1V4skOOIgSlrGs3uBeEATu /N+yQKqh2Gu+2GbVYX0nff3AQUL86sCBbN7G4JifKUsgEMPHFydi+Hmcyny7tZZbhP7++ncih fpsI2yzVH6Lnpy3A9z3mck/PxWig+lwGeUZt5MDJsX9HlxJ/kFTcpwVKN4BPCc/3IZ27XgOXQ HH5TaXVkv8VI8YHQCYI6SBQAmRV9RoXRoSIqyFyegh330OEmMuAnP9EReovhA05uOQ8OW0XP5 xh2ytmeOS2tRrdJARoUnKb5xbD+nYMaYPi7+b4kMJl196CCptyCefwvUbziLAPr4ts9iiCiqs O1e6cJUptwG/2NA7z6akcuZ06wk3DmFQaav41eBF9gIkMlcNgNvpLh/jlKKfd0xEz5gB3N5S6 DXhbGKUWiNf+855BcAuf0kc0w0GgIvx7lj8hhbJdxUN6aWHfOq7JPnHAt8QBl8R7fPGIqS0BS ECc0EtMgsqvGz3C0pg/V7dudPnK1nNFUp+aU+i402P3pu5XPsUwRCz8rY/ibQjm2Lio2Mxmax sq4jjrMpF9qbB9Sh3zPov66UEVbUIkfFNJkaJAFGjq6aOu43e1l6X7mDcZwhfjihaRCGfmVCo mtEJYVporJWn+f9fQkLw37RF4eVZR37mnkEcQ77mc0dJa597PDGmwzgVloGPpFGa20ap9mu1I L90m3jpTIa7fD6mAaFYIMPPayNuFFuuNZRWOmA== Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org FS_IOC_GETFSLABEL/FS_IOC_SETFSLABEL were added in linux-4.18 in xfs, but not in the compat_ioctl case, so add them here. FITRIM was added earlier and also lacks a line the same function, but this is ok because there is an entry in fs/compat_ioctl.c for it. Adding all three here to keep the native and compat ioctl handlers in sync. Cc: stable@vger.kernel.org Fixes: f7664b31975b ("xfs: implement online get/set fs label") Signed-off-by: Arnd Bergmann --- fs/xfs/xfs_ioctl32.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.20.0 diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c index ad91e81a2fcf..63bdc4c1535b 100644 --- a/fs/xfs/xfs_ioctl32.c +++ b/fs/xfs/xfs_ioctl32.c @@ -576,6 +576,9 @@ xfs_file_compat_ioctl( case XFS_IOC_SCRUB_METADATA: case XFS_IOC_BULKSTAT: case XFS_IOC_INUMBERS: + case FITRIM: + case FS_IOC_GETFSLABEL: + case FS_IOC_SETFSLABEL: return xfs_file_ioctl(filp, cmd, (unsigned long)arg); #if !defined(BROKEN_X86_ALIGNMENT) || defined(CONFIG_X86_X32) /*