From patchwork Sat Sep 8 14:28:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 146238 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp627377ljw; Sat, 8 Sep 2018 07:31:25 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda6+u0D9peiJ4z/MZAzHFvEWLnAVCFLecqYCMndtixzbKlhphMPzmV+q03F+f5G4GhEQ3AQ X-Received: by 2002:a17:902:988a:: with SMTP id s10-v6mr12832670plp.200.1536417085448; Sat, 08 Sep 2018 07:31:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536417085; cv=none; d=google.com; s=arc-20160816; b=fqEntJqLv9jzc+lZKhF1FGS7or78OlucSa/7heTSTYt8hgBS4UmHRN4kLyCrkWlmKi w84oEWQVHCjRB2TTQDRN6lPlqZ9hMOHZg0qzVWWXidRF+4rmAcPfubuyxoVzCF7WWPpS lLvs7KoJdvxqjLNccG1MvKOX5XGgge2zlcbB7nubf3BNNkVHTZ9LSnEVy11rXZeZA+GR bDF1p/HiKsVHdOVUk+OnuWXEn7HLLGmExrtarjh/CwGedF9t7smw4lKw+epqiuCa3oQD IeITuBQOS88Mkcyk5ikAr/a0u6VK54l/598WfvCzOw0QYSFHQmqBvF9cdAc8IQV+emPG 3yuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=a+K+X5qprXR74PjWMhPK5scXnMhCf7KT9PQtumAsWjE=; b=FpgKB+KpTNsd9XwR8dt5Ah0zaFZ2AdzdUoSajpW0dwmerk0YlaZGqPxVv9GQlGX/a2 CBndU18dtynF6isFB/eJaKDWNbo/InMOgVnQ0Qqiu4RlnyY69HmdtUfxDdgTrkI4N/hr oIx440OGolDkTCPALvLnHfhqYvJihxYfPsycDEecI150jgbvYiAjbSFWwI6Pa+wSAKnN lM3aH0TVFMqgpeT8Met7yOLuU+rxVx2VO9pcqnPJUzgoYSRaPBry5NN1qAhnvMvRxFz1 jxZ1f/Y1ITrBhzA/OAho3ewQI8f2zfh+Dujo9ZZTm2vhYniuODEH/PLzR5PJ5cp2Y+9c OfUA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 l6-v6si11294985pfc.298.2018.09.08.07.31.25; Sat, 08 Sep 2018 07:31:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727682AbeIHTRW (ORCPT + 32 others); Sat, 8 Sep 2018 15:17:22 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:35157 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727009AbeIHTRW (ORCPT ); Sat, 8 Sep 2018 15:17:22 -0400 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1Mum2d-1fg1Jv33Jr-00rrOL; Sat, 08 Sep 2018 16:31:16 +0200 From: Arnd Bergmann To: viro@zeniv.linux.org.uk Cc: Arnd Bergmann , "Theodore Ts'o" , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 06/11] compat_ioctl: remove /dev/random commands Date: Sat, 8 Sep 2018 16:28:12 +0200 Message-Id: <20180908142837.2819693-6-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180908142837.2819693-1-arnd@arndb.de> References: <20180908142837.2819693-1-arnd@arndb.de> X-Provags-ID: V03:K1:aj9N/Luw1AgvpyHqFjV+g2BVt9SmQDi1RBBVWq/UXeUyPqlGStR /6q8X4FurUmI69zE9AQv50siBmmPxPQrLpywDCyTYvYaof6kCkUtH82PYfXu4YDPhpepNHy hOnac0kSL4cRiGT6opE22cuY3OqFJyTXqmiIdu9QGevCguoZ2io/nkvHw0r0uCs1QsQqK7C /JRNr7SOwQ8tdku1OafmA== X-UI-Out-Filterresults: notjunk:1; V01:K0:VCdWvQt2xfM=:lk2BnzLE5H9lWOjLg2MqeM rBZDVqTB5qxaxwWmlgL3bDVaPOe+LTVuUA/PCtu/Gs0JMsZCiDjD2p2fBt+nHnlafA9jBnXBg /zC6tTC/dZaMdb9jbGg4V9tZLKtYLgffy0yfDO6xT34P/iyc8eycOl4b9XryOTxBAKTCbrMEP 2Vq5afSIArd6k3HDbzDba0aswtojUNNbXi3lJb8q22GddmUiRIVYsjwLN+j/QoBD+rxd3zGN2 PgrfURoFbbJIo6p4Rg8ytwxL/srNxzbNCU/SIRPhylly+GKRyKxsyUZT0sEdg1WyDeFXQ+FoM jzbuNuQkWKf48lDaG2bfeQ06mg5d0H+ln42SWLQ7DdUmSF/azYRIA1yqM4nPr7VnU3MLes6X3 xuhWtwOjr24Z10B4z2Q9e60eDH3T5HQ1N4pUh5vdKQbDguq0A97d4vTaxRDv0oFPfzy7I3w0f b+tignH1npdju6LuBO7x/fWFq3HltOGCf5GgVTCu7eB9uV5Hvrjk8hhPaJsHO1aGffIhMOmDi 6ySWUq7E78EnNlgdzgH1jWKvVXiFdfIde1inuZLdT7KG5ERCR3UxzMinQFcML5JI5AfTpsITH QWA7M6WUxkD0n5d18E6G/qHjAoiN4ZZlpMbMo1EkabJFKm0YuJj+5OA4pGpifYFnmzwbUCNyC BdBzSRMiLUMzhwy1RjneNJsmPs50UGXYWZyGtKm6aYd8SKeUc0wulWjH8uxQ1TWE2neI= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These are all handled by the random driver, so instead of listing each ioctl, we can just use the same function to deal with both native and compat commands. Signed-off-by: Arnd Bergmann --- drivers/char/random.c | 1 + fs/compat_ioctl.c | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) -- 2.18.0 diff --git a/drivers/char/random.c b/drivers/char/random.c index bf5f99fc36f1..103abf82444a 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -2021,6 +2021,7 @@ const struct file_operations random_fops = { .write = random_write, .poll = random_poll, .unlocked_ioctl = random_ioctl, + .compat_ioctl = random_ioctl, .fasync = random_fasync, .llseek = noop_llseek, }; diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index b56a3842d61d..eb29188d1dbb 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -594,13 +594,6 @@ COMPATIBLE_IOCTL(WDIOC_SETTIMEOUT) COMPATIBLE_IOCTL(WDIOC_GETTIMEOUT) COMPATIBLE_IOCTL(WDIOC_SETPRETIMEOUT) COMPATIBLE_IOCTL(WDIOC_GETPRETIMEOUT) -/* Big R */ -COMPATIBLE_IOCTL(RNDGETENTCNT) -COMPATIBLE_IOCTL(RNDADDTOENTCNT) -COMPATIBLE_IOCTL(RNDGETPOOL) -COMPATIBLE_IOCTL(RNDADDENTROPY) -COMPATIBLE_IOCTL(RNDZAPENTCNT) -COMPATIBLE_IOCTL(RNDCLEARPOOL) /* Bluetooth */ COMPATIBLE_IOCTL(HCIDEVUP) COMPATIBLE_IOCTL(HCIDEVDOWN)