From patchwork Thu Dec 16 09:44:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 12696411 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 83F46C433EF for ; Thu, 16 Dec 2021 09:48:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Isq162NIfqG4UYQBeknaIUoqF544ivaLiXSbyufSP0s=; b=pYutx84Fgiaaxq BwikOgN1nO1Q62fwT/mKw3L1/HJ+ahB+KVMbxXjLyyW0TIimugHcje8L6fBF27KUpCMSj8aULTisE DMB+XyoZN8QiPUgDnipd30YHJS1xi+yS/Iro2mb2tqTg/1UEavKpXUPpRAt1ccW9+Jypepqn1kD1H nr0WBe9a10Mnx+qfG9S/InZviMJc+iuDJnicOv98M1AsWtbRRr983HhBvw6qnsL/ndcSsE2K2HQXO A2Y87K0luvkM0domQ3EgCCHPXFPdiPv4R+5WNXSXqUqWGsYDj6D2EgzF+IB02IrHMItwfA7VwjU3k PwlPF43yC04OOqeKz6DQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxnKw-004ZiC-Bf; Thu, 16 Dec 2021 09:46:10 +0000 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxnKn-004Zfz-7n for linux-arm-kernel@lists.infradead.org; Thu, 16 Dec 2021 09:45:58 +0000 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 14E8F3F1FD for ; Thu, 16 Dec 2021 09:45:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1639647956; bh=ifKlZYGTOPdFCSDCTOtZXvFjnN1ta3FdQcJv2C1mO4Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fVzS7WDZ0tvqCBRSF/9uRZczVkmYw+UAiie968Cs1axe3IZviSKT0Qow5+aYq6KQy MWedyIX10027/Hwfv8QIn78oW8tG9Xi1TIKmnPXxv/mPBgmjgTlB/23MQPK2f18Z+k xUpwygNe2W3FmVFwl66Lmsv6FoQqN9Jb5hdllGOPtOu2V/N9edGiaFiziw8Ujjwv96 RNTj0DDhpXKyo9zXhPazHAcKhN1eVN1L3IC3OKlJpuUN7zOTG/QBM/6hmhAkBfVQJ5 Gob2Dq+OmSOunryjsfCRWku+5EOtDsRhLfgW+0kuMcctfM8CdcPSVCraRTy6YEHnxI La11wlELrWb9A== Received: by mail-wm1-f70.google.com with SMTP id p13-20020a05600c1d8d00b0034565e7e5c6so2182949wms.9 for ; Thu, 16 Dec 2021 01:45:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ifKlZYGTOPdFCSDCTOtZXvFjnN1ta3FdQcJv2C1mO4Q=; b=uB3OPTXhEGw4wBFqCeh2opDlkNxRwIOToM2L38ArTw82MxUb0lPLOpxUoArPjw3Vvs 52e7aU6JGg5/OGgR0sAksPcjfpH4SLdQg7/01qES1XC6dR+KpASk790ENFApJa6hm7TO 5GCyt5BcZPF1omolHz1yvBXpmlRfx1zHnvrSI5SIV8zpHaQKuUFDOEdaedkSZIFZInDx 7AzDQoWSlGc0blCD/mnL+lfKZsN6KON+fo+Bv4X2vjzxUxWwCkw66WSQCC0+1o4Ec+5P cC5kkRdIBD1+kMJrzrK5Al8kg96E85s5vzLzMFdN4/h9fOjLUdeCb9PRzoyqDk5NVpAL vYgw== X-Gm-Message-State: AOAM530kSIUFDSIsWKaGmsGBKxxvXcHrOf8oVcToTxojCzbxUl/ZWmWZ yVeXnQLMqF67kF/G8UWC4NM1A3PG6WedxyErA8bQynHsPhtq87nAxporPj/DlarR+4ivtHoXHcU ZrUDWRX09dNmhi34xtlUtY7taqYrlbFzN+Z5nfhkOBdM6HQAllSDW X-Received: by 2002:a5d:59af:: with SMTP id p15mr8145367wrr.314.1639647955366; Thu, 16 Dec 2021 01:45:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJyzUGy/dKebedUXgoem/d6gyVVYcP7Z2hszf3HxXNiUwHW6hBLUxxafQ7sSJ/XEtEqxAbevgA== X-Received: by 2002:a5d:59af:: with SMTP id p15mr8145334wrr.314.1639647955104; Thu, 16 Dec 2021 01:45:55 -0800 (PST) Received: from alex.home (lfbn-gre-1-195-1.w90-112.abo.wanadoo.fr. [90.112.158.1]) by smtp.gmail.com with ESMTPSA id t8sm4349398wrv.30.2021.12.16.01.45.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 01:45:54 -0800 (PST) From: Alexandre Ghiti To: Steve French , Jonathan Corbet , David Howells , Russell King , Thomas Bogendoerfer , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Yoshinori Sato , Rich Felker , Matti Vaittinen , Lee Jones , Jeff Layton , Greg Kroah-Hartman , Arnd Bergmann , Ronnie Sahlberg , Guenter Roeck , Wim Van Sebroeck , Lukas Bulwahn , Luis Chamberlain , Kalle Valo , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-cachefs@redhat.com, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-power@fi.rohmeurope.com Cc: Alexandre Ghiti Subject: [PATCH v2 1/6] Documentation, arch: Remove leftovers from fscache/cachefiles histograms Date: Thu, 16 Dec 2021 10:44:21 +0100 Message-Id: <20211216094426.2083802-2-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> References: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211216_014557_456150_845EA686 X-CRM114-Status: GOOD ( 17.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org A few references to the fscache and cachefiles histograms were left in the Documentation and some arch defconfigs: remove them since those configs do not exist anymore. Fixes: 6ae9bd8bb037("fscache, cachefiles: Remove the histogram stuff") Signed-off-by: Alexandre Ghiti Acked-by: Arnd Bergmann [arch/arm/configs] --- .../filesystems/caching/cachefiles.rst | 34 ------------------- Documentation/filesystems/caching/fscache.rst | 34 ++----------------- arch/arm/configs/axm55xx_defconfig | 2 -- 3 files changed, 2 insertions(+), 68 deletions(-) diff --git a/Documentation/filesystems/caching/cachefiles.rst b/Documentation/filesystems/caching/cachefiles.rst index e58bc1fd312a..e59861458029 100644 --- a/Documentation/filesystems/caching/cachefiles.rst +++ b/Documentation/filesystems/caching/cachefiles.rst @@ -424,40 +424,6 @@ for CacheFiles to run in a context of a specific security label, or to create files and directories with another security label. -Statistical Information -======================= - -If FS-Cache is compiled with the following option enabled:: - - CONFIG_CACHEFILES_HISTOGRAM=y - -then it will gather certain statistics and display them through a proc file. - - /proc/fs/cachefiles/histogram - - :: - - cat /proc/fs/cachefiles/histogram - JIFS SECS LOOKUPS MKDIRS CREATES - ===== ===== ========= ========= ========= - - This shows the breakdown of the number of times each amount of time - between 0 jiffies and HZ-1 jiffies a variety of tasks took to run. The - columns are as follows: - - ======= ======================================================= - COLUMN TIME MEASUREMENT - ======= ======================================================= - LOOKUPS Length of time to perform a lookup on the backing fs - MKDIRS Length of time to perform a mkdir on the backing fs - CREATES Length of time to perform a create on the backing fs - ======= ======================================================= - - Each row shows the number of events that took a particular range of times. - Each step is 1 jiffy in size. The JIFS column indicates the particular - jiffy range covered, and the SECS field the equivalent number of seconds. - - Debugging ========= diff --git a/Documentation/filesystems/caching/fscache.rst b/Documentation/filesystems/caching/fscache.rst index 70de86922b6a..66e31a6d1070 100644 --- a/Documentation/filesystems/caching/fscache.rst +++ b/Documentation/filesystems/caching/fscache.rst @@ -201,10 +201,9 @@ Statistical Information If FS-Cache is compiled with the following options enabled:: CONFIG_FSCACHE_STATS=y - CONFIG_FSCACHE_HISTOGRAM=y -then it will gather certain statistics and display them through a number of -proc files. +then it will gather certain statistics and display them through the following +proc file. /proc/fs/fscache/stats ---------------------- @@ -413,35 +412,6 @@ proc files. -/proc/fs/fscache/histogram --------------------------- - - :: - - cat /proc/fs/fscache/histogram - JIFS SECS OBJ INST OP RUNS OBJ RUNS RETRV DLY RETRIEVLS - ===== ===== ========= ========= ========= ========= ========= - - This shows the breakdown of the number of times each amount of time - between 0 jiffies and HZ-1 jiffies a variety of tasks took to run. The - columns are as follows: - - ========= ======================================================= - COLUMN TIME MEASUREMENT - ========= ======================================================= - OBJ INST Length of time to instantiate an object - OP RUNS Length of time a call to process an operation took - OBJ RUNS Length of time a call to process an object event took - RETRV DLY Time between an requesting a read and lookup completing - RETRIEVLS Time between beginning and end of a retrieval - ========= ======================================================= - - Each row shows the number of events that took a particular range of times. - Each step is 1 jiffy in size. The JIFS column indicates the particular - jiffy range covered, and the SECS field the equivalent number of seconds. - - - Object List =========== diff --git a/arch/arm/configs/axm55xx_defconfig b/arch/arm/configs/axm55xx_defconfig index 46075216ee6d..b36e0b347d1f 100644 --- a/arch/arm/configs/axm55xx_defconfig +++ b/arch/arm/configs/axm55xx_defconfig @@ -204,11 +204,9 @@ CONFIG_FUSE_FS=y CONFIG_CUSE=y CONFIG_FSCACHE=y CONFIG_FSCACHE_STATS=y -CONFIG_FSCACHE_HISTOGRAM=y CONFIG_FSCACHE_DEBUG=y CONFIG_FSCACHE_OBJECT_LIST=y CONFIG_CACHEFILES=y -CONFIG_CACHEFILES_HISTOGRAM=y CONFIG_ISO9660_FS=y CONFIG_UDF_FS=y CONFIG_MSDOS_FS=y From patchwork Thu Dec 16 09:44:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 12696419 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B65E3C433EF for ; Thu, 16 Dec 2021 09:53:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=RhBLW0uYWkeX56ArcCR4QImURs78T8hU1/KnX3kEfO0=; b=lZuEOr6cllajiI OHUBa+vpeX9i7O9anawDKyzWMiMtHQQPbZJQGlfzqcFrU85SgML9pqLZtGEcbaRFoYYSInfzHS4Dl LvfGXBGTEbK6ehEx8Kky4Ohc3lin/FPBNqRLAcNFheKpniAjgPnkQ7Sqi3JVWnudcPC6Iy4kvtCXk ScU0clNdjwS6QrUe4kV01qvCDBV0wMaxmuXrzGclwdJVingjNgMCvF80c0niNYcpp36cIGgdKdbsL nO6uTTc9nuIxaUojvtK5Al1MiyJ/i5ZGw8WfCKfNqrMqJ2NwxVYUD25Uq0wAPIP3Vz+HMulJupg9u W2v4xCRmtaiXrY5zdBJw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxnQJ-004ciV-C8; Thu, 16 Dec 2021 09:51:41 +0000 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxnLy-004aOt-D8 for linux-arm-kernel@lists.infradead.org; Thu, 16 Dec 2021 09:47:12 +0000 Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 4903640036 for ; Thu, 16 Dec 2021 09:47:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1639648028; bh=vikRa1nxzcY4uLugL2Q09RF+hmHrdpmpkJ7AXRwjM28=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pmYvLMXoeSN3XDQBh1g4HMTRbEPSNGP1mPaTA9BSeJ5j7tcbypcEoAUZfahTPxyXD ++053zjf61rin9V/wceMbM3bn+8fHjOQz2SlG5U7fD4zMXxO8wEVyESsKa+fuiQ7Lk 1Be/w0/83Zhok81QYHL7JYcbKnJIT8Xt6guwoCcyaUlIMeHPtQ2IqsEsqnbtE2MPFp O/K+rwujyvjeW3/oy4taDs8cP9FI4g8g5240S5XxqK0Df90svsXoDO5/3mMYGJDVoD Grf1CVsFLlOraKWzAb5YKKtPhZrx7mm8J8mY53x1zWbDP6Hdwcw7wshj5YCkUovX6B Oqi/1VL882Oww== Received: by mail-lf1-f72.google.com with SMTP id j9-20020a05651231c900b004037efe9fddso10352191lfe.18 for ; Thu, 16 Dec 2021 01:47:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vikRa1nxzcY4uLugL2Q09RF+hmHrdpmpkJ7AXRwjM28=; b=Sd3FJAlDIphSVYCzvgbg9nKKy7JwA1oex96aIOTAqLWYaDVe0TyHPxWQnHK/OSrHAh XOo1IeVwCg5Llej7POwxoRDhmDhpnTTZXiTTFEzHDPNYjgEuJkDp0C8BX6mBn63Jjbl4 0vG9vqygmMFKu+8knr0yEEa9I0zJUbk873b3UgS+c4fZ+/3GjdwrfA49+dtRDz2fQhX0 aZr96opGqs8yFBTgT9EDEdiPhxHRry8+3+WgLPVSiB+ci/pr9khZs8GGtf14W3uHa6nq dngRCZsxVdDDIm48H/DzZx/CAqb3e0znNM5NSHGSFBnNU6fp9zX99luikfGSDKljhYhY nnBA== X-Gm-Message-State: AOAM532VGPosthyO+J6eTpqqv4s5vLgf4fUOewVtGS2MQ8VPajHJLxaJ oOZ3ImUCWvr7JV/VjiRmr65xXHtfFuVgWzycgkaaAHyVOVTkwM3UJs47warvOU6O0xB0U4WBTXy IEYiiwGAiIW8G6RLn6CA9orOracFEbbtyG+r4sZFFx8QaMrv100dF X-Received: by 2002:a5d:5850:: with SMTP id i16mr8192914wrf.410.1639648016604; Thu, 16 Dec 2021 01:46:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJwA4Cb/78g/Np23rRrFeNNA+mcm6HyKEgF1u2KfoVSUn+c47106OcZ0yzWX4XGZuoK1ZlxQZQ== X-Received: by 2002:a5d:5850:: with SMTP id i16mr8192881wrf.410.1639648016431; Thu, 16 Dec 2021 01:46:56 -0800 (PST) Received: from alex.home (lfbn-gre-1-195-1.w90-112.abo.wanadoo.fr. [90.112.158.1]) by smtp.gmail.com with ESMTPSA id d15sm5660966wri.50.2021.12.16.01.46.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 01:46:56 -0800 (PST) From: Alexandre Ghiti To: Steve French , Jonathan Corbet , David Howells , Russell King , Thomas Bogendoerfer , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Yoshinori Sato , Rich Felker , Matti Vaittinen , Lee Jones , Jeff Layton , Greg Kroah-Hartman , Arnd Bergmann , Ronnie Sahlberg , Guenter Roeck , Wim Van Sebroeck , Lukas Bulwahn , Luis Chamberlain , Kalle Valo , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-cachefs@redhat.com, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-power@fi.rohmeurope.com Cc: Alexandre Ghiti Subject: [PATCH v2 2/6] Documentation, arch: Remove leftovers from raw device Date: Thu, 16 Dec 2021 10:44:22 +0100 Message-Id: <20211216094426.2083802-3-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> References: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211216_014710_593753_87097720 X-CRM114-Status: GOOD ( 14.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Raw device interface was removed so remove all references to configs related to it. Fixes: 603e4922f1c8 ("remove the raw driver") Signed-off-by: Alexandre Ghiti Acked-by: Arnd Bergmann [arch/arm/configs] --- Documentation/admin-guide/devices.txt | 8 +------- arch/arm/configs/spear13xx_defconfig | 1 - arch/arm/configs/spear3xx_defconfig | 1 - arch/arm/configs/spear6xx_defconfig | 1 - arch/powerpc/configs/pseries_defconfig | 1 - 5 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Documentation/admin-guide/devices.txt b/Documentation/admin-guide/devices.txt index 922c23bb4372..c07dc0ee860e 100644 --- a/Documentation/admin-guide/devices.txt +++ b/Documentation/admin-guide/devices.txt @@ -2339,13 +2339,7 @@ disks (see major number 3) except that the limit on partitions is 31. - 162 char Raw block device interface - 0 = /dev/rawctl Raw I/O control device - 1 = /dev/raw/raw1 First raw I/O device - 2 = /dev/raw/raw2 Second raw I/O device - ... - max minor number of raw device is set by kernel config - MAX_RAW_DEVS or raw module parameter 'max_raw_devs' + 162 char Used for (now removed) raw block device interface 163 char diff --git a/arch/arm/configs/spear13xx_defconfig b/arch/arm/configs/spear13xx_defconfig index 3b206a31902f..065553326b39 100644 --- a/arch/arm/configs/spear13xx_defconfig +++ b/arch/arm/configs/spear13xx_defconfig @@ -61,7 +61,6 @@ CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_RAW_DRIVER=y -CONFIG_MAX_RAW_DEVS=8192 CONFIG_I2C=y CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_SPI=y diff --git a/arch/arm/configs/spear3xx_defconfig b/arch/arm/configs/spear3xx_defconfig index fc5f71c765ed..afca722d6605 100644 --- a/arch/arm/configs/spear3xx_defconfig +++ b/arch/arm/configs/spear3xx_defconfig @@ -41,7 +41,6 @@ CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_RAW_DRIVER=y -CONFIG_MAX_RAW_DEVS=8192 CONFIG_I2C=y CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_SPI=y diff --git a/arch/arm/configs/spear6xx_defconfig b/arch/arm/configs/spear6xx_defconfig index 52a56b8ce6a7..bc32c02cb86b 100644 --- a/arch/arm/configs/spear6xx_defconfig +++ b/arch/arm/configs/spear6xx_defconfig @@ -36,7 +36,6 @@ CONFIG_INPUT_FF_MEMLESS=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_RAW_DRIVER=y -CONFIG_MAX_RAW_DEVS=8192 CONFIG_I2C=y CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_SPI=y diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index de7641adb899..e64f2242abe1 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig @@ -189,7 +189,6 @@ CONFIG_HVCS=m CONFIG_VIRTIO_CONSOLE=m CONFIG_IBM_BSR=m CONFIG_RAW_DRIVER=y -CONFIG_MAX_RAW_DEVS=1024 CONFIG_I2C_CHARDEV=y CONFIG_FB=y CONFIG_FIRMWARE_EDID=y From patchwork Thu Dec 16 09:44:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 12696421 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 990C2C433F5 for ; Thu, 16 Dec 2021 09:54:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=drkHMiCRoOmieB8GzVvu5PZ20JiniRK8rtFmO0Ms/GA=; b=Wi0McK/ApqpUCj k/yL8NyMqTJlK9z1zKq3MIg0jH0RdpzIzagC58iSqPlAb+UvJYmH94ga34q/eJuzRFbAw4+tomh0D Kw923FMI8rG94pYMh4DZVq8qzESrTJ2kQy9O49i/d9PViSxmYhes5j0XqKKKPa2Ss1FMaaxdeydBk aAiOjxp0/qmS2jG9UsSF2pVkVXyTBbLhsEA7TFLobFgtnCJ1r2u7ELf3AM/HvPIi50ahyVsbpfdWn repzaxE/bTJ2EMKvKaMyH7KxEclAkQq87HXLdQQ8BCDyqDu2JYLynl+7vo0yWIYGBamAl9FjT9sE7 5WkRaXM9dDEMjJA9OmBw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxnRc-004dNp-J0; Thu, 16 Dec 2021 09:53:01 +0000 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxnMl-004akg-SM for linux-arm-kernel@lists.infradead.org; Thu, 16 Dec 2021 09:48:02 +0000 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 66D7D3F1B0 for ; Thu, 16 Dec 2021 09:47:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1639648078; bh=UA5EztZHI/uiiMUXLzWoUuv2dZPMgtdfvbN4/RIGhNw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=f/HhbrlvQocddEJJJuRsGZRUCb6Pf0FPMJdeL9WeTXio87QJCQhfjzzlsY1UjB8gt VpQLCf9kIEL5ywvOGkDdZyotAoiVj/tto41gCCgMODvlukjOUpPD/7ufv/vxvbQXe1 AsKzU5smXY9+LGFq7iKrOH6ukEN/Q7dP8/66lA7mcFJnt7CJovkql9+HbVS28h8vg+ SedtfN4eajFxrFqFK+tMTY38wcciamaIx5EtRubqMnCOrUpT+k5++jFBN7jaDiymzX KLbgiIqX6DmkHs4kdH6wnzlc2orS3+jfUj1SagmIuOsm2NzW4fZSpjWHOsdt0ULpFm eIM8N3QXdYT1Q== Received: by mail-wr1-f69.google.com with SMTP id h7-20020adfaa87000000b001885269a937so6769021wrc.17 for ; Thu, 16 Dec 2021 01:47:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UA5EztZHI/uiiMUXLzWoUuv2dZPMgtdfvbN4/RIGhNw=; b=jTLaBw7pUOHSlBaWghIFyCOwZAcws2EkQyWoH9FdqHW3FvTlBgpXmjBSDOtWneC+OY KGqD5NdJVQL3mQGTbNcOc1YFYBqpchnmxjmxRXH/2YxzADi85GF914eCp6B7TUMsr+QF d7bsFExxtHtXgOdkOC40fH0n5ZjA4oDhl9ZbKqP5MPpwQo3L218KGQYeA6JKcPOobz4v CcM+UDSp6QWHBCazKZtGw0B+/f3xQHXxXwV2kNO3kfCeDOOXFICxAG+YVM6PdUnCzgOp nPyUL929WKYPegvLno+xcLmFE34vTaVm6OiwF9XNllMA+n0GWzsMXRwMbSHt9vt6A9Zm a2/g== X-Gm-Message-State: AOAM530y5kbLt/f03/43Ti+owFO5uNP+NpTg+3swGEoa9M5WmFGeTeL4 xhYWN1QTZt6gMzro+ypi9QHFlUQW6XMFWSzn/17EV30mMCXQfgGzEzuCzizTlrIqAi+wjiPTRNJ b1l9EJmB9SmlOaWSmw9f156YfQKOsaIkGJLUgJqrtc60bKc0wxJTS X-Received: by 2002:a1c:740c:: with SMTP id p12mr316000wmc.140.1639648077990; Thu, 16 Dec 2021 01:47:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJyePI8Du4Q8VFJBsAu6osq6C3A++AYoB7smlNaZZ2VPRzrhLbuU04wBMA93ArT9KvS81ExrOQ== X-Received: by 2002:a1c:740c:: with SMTP id p12mr315973wmc.140.1639648077773; Thu, 16 Dec 2021 01:47:57 -0800 (PST) Received: from alex.home (lfbn-gre-1-195-1.w90-112.abo.wanadoo.fr. [90.112.158.1]) by smtp.gmail.com with ESMTPSA id g124sm7250562wme.28.2021.12.16.01.47.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 01:47:57 -0800 (PST) From: Alexandre Ghiti To: Steve French , Jonathan Corbet , David Howells , Russell King , Thomas Bogendoerfer , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Yoshinori Sato , Rich Felker , Matti Vaittinen , Lee Jones , Jeff Layton , Greg Kroah-Hartman , Arnd Bergmann , Ronnie Sahlberg , Guenter Roeck , Wim Van Sebroeck , Lukas Bulwahn , Luis Chamberlain , Kalle Valo , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-cachefs@redhat.com, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-power@fi.rohmeurope.com Cc: Alexandre Ghiti , Steve French Subject: [PATCH v2 3/6] Documentation, arch: Remove leftovers from CIFS_WEAK_PW_HASH Date: Thu, 16 Dec 2021 10:44:23 +0100 Message-Id: <20211216094426.2083802-4-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> References: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211216_014800_103356_99936BD7 X-CRM114-Status: GOOD ( 14.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This config was removed so remove all references to it. Fixes: 76a3c92ec9e0 ("cifs: remove support for NTLM and weaker authentication algorithms") Signed-off-by: Alexandre Ghiti Reviewed-by: Steve French Acked-by: Arnd Bergmann [arch/arm/configs] --- Documentation/admin-guide/cifs/usage.rst | 7 +++---- arch/arm/configs/cm_x300_defconfig | 1 - arch/arm/configs/ezx_defconfig | 1 - arch/arm/configs/imote2_defconfig | 1 - arch/arm/configs/nhk8815_defconfig | 1 - arch/arm/configs/pxa_defconfig | 1 - arch/mips/configs/fuloong2e_defconfig | 1 - arch/mips/configs/malta_qemu_32r6_defconfig | 1 - arch/mips/configs/maltaaprp_defconfig | 1 - arch/mips/configs/maltasmvp_defconfig | 1 - arch/mips/configs/maltasmvp_eva_defconfig | 1 - arch/mips/configs/maltaup_defconfig | 1 - arch/powerpc/configs/ppc6xx_defconfig | 1 - arch/sh/configs/titan_defconfig | 1 - 14 files changed, 3 insertions(+), 17 deletions(-) diff --git a/Documentation/admin-guide/cifs/usage.rst b/Documentation/admin-guide/cifs/usage.rst index f170d8820258..3766bf8a1c20 100644 --- a/Documentation/admin-guide/cifs/usage.rst +++ b/Documentation/admin-guide/cifs/usage.rst @@ -734,10 +734,9 @@ SecurityFlags Flags which control security negotiation and using weaker password hashes is 0x37037 (lanman, plaintext, ntlm, ntlmv2, signing allowed). Some SecurityFlags require the corresponding menuconfig - options to be enabled (lanman and plaintext require - CONFIG_CIFS_WEAK_PW_HASH for example). Enabling - plaintext authentication currently requires also - enabling lanman authentication in the security flags + options to be enabled. Enabling plaintext + authentication currently requires also enabling + lanman authentication in the security flags because the cifs module only supports sending laintext passwords using the older lanman dialect form of the session setup SMB. (e.g. for authentication diff --git a/arch/arm/configs/cm_x300_defconfig b/arch/arm/configs/cm_x300_defconfig index 502a9d870ca4..45769d0ddd4e 100644 --- a/arch/arm/configs/cm_x300_defconfig +++ b/arch/arm/configs/cm_x300_defconfig @@ -146,7 +146,6 @@ CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_PARTITION_ADVANCED=y CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_ISO8859_1=m diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig index a49e699e52de..ec84d80096b1 100644 --- a/arch/arm/configs/ezx_defconfig +++ b/arch/arm/configs/ezx_defconfig @@ -314,7 +314,6 @@ CONFIG_NFSD_V3_ACL=y CONFIG_SMB_FS=m CONFIG_CIFS=m CONFIG_CIFS_STATS=y -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m diff --git a/arch/arm/configs/imote2_defconfig b/arch/arm/configs/imote2_defconfig index 118c4c927f26..6db871d4e077 100644 --- a/arch/arm/configs/imote2_defconfig +++ b/arch/arm/configs/imote2_defconfig @@ -288,7 +288,6 @@ CONFIG_NFSD_V3_ACL=y CONFIG_SMB_FS=m CONFIG_CIFS=m CONFIG_CIFS_STATS=y -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig index 23595fc5a29a..907d6512821a 100644 --- a/arch/arm/configs/nhk8815_defconfig +++ b/arch/arm/configs/nhk8815_defconfig @@ -127,7 +127,6 @@ CONFIG_NFS_FS=y CONFIG_NFS_V3_ACL=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ASCII=y CONFIG_NLS_ISO8859_1=y diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig index 58f4834289e6..dedaaae3d0d8 100644 --- a/arch/arm/configs/pxa_defconfig +++ b/arch/arm/configs/pxa_defconfig @@ -699,7 +699,6 @@ CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_CIFS=m CONFIG_CIFS_STATS=y -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_DEFAULT="utf8" diff --git a/arch/mips/configs/fuloong2e_defconfig b/arch/mips/configs/fuloong2e_defconfig index 5c24ac7fdf56..ba47c5e929b7 100644 --- a/arch/mips/configs/fuloong2e_defconfig +++ b/arch/mips/configs/fuloong2e_defconfig @@ -206,7 +206,6 @@ CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_CIFS=m CONFIG_CIFS_STATS2=y -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_CIFS_DEBUG2=y diff --git a/arch/mips/configs/malta_qemu_32r6_defconfig b/arch/mips/configs/malta_qemu_32r6_defconfig index 614af02d83e6..6fb9bc29f4a0 100644 --- a/arch/mips/configs/malta_qemu_32r6_defconfig +++ b/arch/mips/configs/malta_qemu_32r6_defconfig @@ -165,7 +165,6 @@ CONFIG_TMPFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m diff --git a/arch/mips/configs/maltaaprp_defconfig b/arch/mips/configs/maltaaprp_defconfig index 9c051f8fd330..eb72df528243 100644 --- a/arch/mips/configs/maltaaprp_defconfig +++ b/arch/mips/configs/maltaaprp_defconfig @@ -166,7 +166,6 @@ CONFIG_TMPFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m diff --git a/arch/mips/configs/maltasmvp_defconfig b/arch/mips/configs/maltasmvp_defconfig index 2e90d97551d6..1fb40d310f49 100644 --- a/arch/mips/configs/maltasmvp_defconfig +++ b/arch/mips/configs/maltasmvp_defconfig @@ -167,7 +167,6 @@ CONFIG_TMPFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m diff --git a/arch/mips/configs/maltasmvp_eva_defconfig b/arch/mips/configs/maltasmvp_eva_defconfig index d1f7fdb27284..75cb778c6149 100644 --- a/arch/mips/configs/maltasmvp_eva_defconfig +++ b/arch/mips/configs/maltasmvp_eva_defconfig @@ -169,7 +169,6 @@ CONFIG_TMPFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m diff --git a/arch/mips/configs/maltaup_defconfig b/arch/mips/configs/maltaup_defconfig index 48e5bd492452..7b4f247dc60c 100644 --- a/arch/mips/configs/maltaup_defconfig +++ b/arch/mips/configs/maltaup_defconfig @@ -165,7 +165,6 @@ CONFIG_TMPFS=y CONFIG_NFS_FS=y CONFIG_ROOT_NFS=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y CONFIG_NLS_CODEPAGE_437=m diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig index 6697c5e6682f..bb549cb1c3e3 100644 --- a/arch/powerpc/configs/ppc6xx_defconfig +++ b/arch/powerpc/configs/ppc6xx_defconfig @@ -1022,7 +1022,6 @@ CONFIG_NFSD=m CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V4=y CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y diff --git a/arch/sh/configs/titan_defconfig b/arch/sh/configs/titan_defconfig index ba887f1351be..cd5c58916c65 100644 --- a/arch/sh/configs/titan_defconfig +++ b/arch/sh/configs/titan_defconfig @@ -242,7 +242,6 @@ CONFIG_NFSD=y CONFIG_NFSD_V3=y CONFIG_SMB_FS=m CONFIG_CIFS=m -CONFIG_CIFS_WEAK_PW_HASH=y CONFIG_PARTITION_ADVANCED=y CONFIG_NLS_CODEPAGE_437=m CONFIG_NLS_ASCII=m From patchwork Thu Dec 16 09:44:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 12696422 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DD254C433EF for ; Thu, 16 Dec 2021 09:55:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JJDl4ceeaXLEQFIuXhMMhEfGuqCYtV1nVJDFuqgcuhc=; b=QOHh6TxiUV0bGT mVRZXfpARLDAd0W9JvWw5aktHeLqF2qvjOo8+Ejn3Nyu/pKQ6UWMMa7N4B1Cui2kMXc9zYNTBbsLf RNOm5zWNWgdLwn+9EztmRbzJB4GcSSwVWXh7ZxU5wzKAp6H39UYSFk1tz1iw/4mJYZ6Vevtt54ARV XN39H10FBG0xUUqknzkfdFTCkUInMf2Hrgz7/coH2izQv62aPWen7vCOs2Nj3fVuvC1lelf6shqoG fPNnGF+kpzyakAlhEZGqfpCiY1mfqZL2FbY7nfuLNd/ZESN5dUwXPRDYIZJfCxnUBVs8pl2zqgBuj dRmGLeSn6ys32muAybXw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxnSS-004dpM-Fx; Thu, 16 Dec 2021 09:53:53 +0000 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxnNl-004bHh-LL for linux-arm-kernel@lists.infradead.org; Thu, 16 Dec 2021 09:49:03 +0000 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id A597C3FFD7 for ; Thu, 16 Dec 2021 09:48:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1639648139; bh=WUEOV0Puf0rdsNKOWUqNq9jf3IbOHS9FDzqSlVW9pZ4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nZxEyNNZHWjS7EkYXH7Krd5iNaR7s1Ld2Hxs6evJ3tRaGBRhKwm48gmY3aKeS9UMd BqQPgTP6wqHzmb5j3ahhpwUICm2xNlPuQnvqjzvnyvpDOoupfPmPK6l1kTha70OQQN fwJI6wjrIuAJMtYe0O4g7k2RevogUJYIUTJvBi2HqpdftM+u7HrdyKXcDgkLQmQoKk O6aFyDPAg/PEzh0NiwFzKVablM4JfmMhWQzhyrVwToagjibsgJSHXwhSwOFrx2Q1od yMkobQcaZrx0EEUZ5EXIT58wNQ9OWG7WC/farrSafyGg4gYluCeRN3mlIxGfit/2Ih yQU/aWWARSiWg== Received: by mail-wr1-f71.google.com with SMTP id p15-20020adfaa0f000000b001a240b45c1fso426261wrd.4 for ; Thu, 16 Dec 2021 01:48:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WUEOV0Puf0rdsNKOWUqNq9jf3IbOHS9FDzqSlVW9pZ4=; b=y+EJfbfKpq0mJefxwIWLlYRPw39BnKln7sM9JB5+PVOMdyUpKM4K75SEKJxWPPP8M8 68eAR3xXTj6B9hi0NLZNBlwKePjOcMA2AGzHwh9tNlpv+WNqL7l/Jjaauqid4UsRtQNi Y7UolT1ua4ZpAwOSoZa77Y+V5ZcZcLOh/9YLOoOU1dgWiz2sqhTXE28kPpzQxY1vA9HP PHEd0uUci+O4L00fJRxhXsCkeVmX4XHxI2cWo/ahQrdJihvzlgCXeBdoJ3/NoO3/xF38 WY7VID7g2YR/Ha+vQYMUPLTqizW8DKuIck/+YtITxxBpHNEXYeWJLpcmEmQ6/HqnTK3I 3laA== X-Gm-Message-State: AOAM532WQ3xQ5/jKX0jtG+JVpilEk7i9L1k0j6flv+WqEzimJjl0yiI0 oxzyIN5zmxi65VwCemr+kIBMYJAeqUTz1wvmiBuGhIT2Ep00ZmT+B1BN8bTGdFybO7XFsouB2bN tzUZQ1AtKXPHxyZt12hOXY8nY9nU/oydSuE7unuKu2nvMGSvhrl1m X-Received: by 2002:a5d:69c5:: with SMTP id s5mr8274620wrw.283.1639648139312; Thu, 16 Dec 2021 01:48:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJy4D7RcuSiJhn58Bkp9nDVxQgFgFxFbQZtRi6SJVIaJvvuUPrIa3b5F/cBoS8baOoKUv8xnUw== X-Received: by 2002:a5d:69c5:: with SMTP id s5mr8274584wrw.283.1639648139155; Thu, 16 Dec 2021 01:48:59 -0800 (PST) Received: from alex.home (lfbn-gre-1-195-1.w90-112.abo.wanadoo.fr. [90.112.158.1]) by smtp.gmail.com with ESMTPSA id m36sm4145891wms.25.2021.12.16.01.48.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 01:48:58 -0800 (PST) From: Alexandre Ghiti To: Steve French , Jonathan Corbet , David Howells , Russell King , Thomas Bogendoerfer , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Yoshinori Sato , Rich Felker , Matti Vaittinen , Lee Jones , Jeff Layton , Greg Kroah-Hartman , Arnd Bergmann , Ronnie Sahlberg , Guenter Roeck , Wim Van Sebroeck , Lukas Bulwahn , Luis Chamberlain , Kalle Valo , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-cachefs@redhat.com, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-power@fi.rohmeurope.com Cc: Alexandre Ghiti Subject: [PATCH v2 4/6] arch: Remove leftovers from mandatory file locking Date: Thu, 16 Dec 2021 10:44:24 +0100 Message-Id: <20211216094426.2083802-5-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> References: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211216_014901_955141_A4716D78 X-CRM114-Status: GOOD ( 13.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This config was removed so remove all references to it. Fixes: f7e33bdbd6d1 ("fs: remove mandatory file locking support") Signed-off-by: Alexandre Ghiti Reviewed-by: Jeff Layton --- arch/mips/configs/decstation_64_defconfig | 1 - arch/mips/configs/decstation_defconfig | 1 - arch/mips/configs/decstation_r4k_defconfig | 1 - 3 files changed, 3 deletions(-) diff --git a/arch/mips/configs/decstation_64_defconfig b/arch/mips/configs/decstation_64_defconfig index 85f1955b4b00..e2ed105f8c97 100644 --- a/arch/mips/configs/decstation_64_defconfig +++ b/arch/mips/configs/decstation_64_defconfig @@ -144,7 +144,6 @@ CONFIG_EXT2_FS_SECURITY=y CONFIG_EXT3_FS=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -# CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_ISO9660_FS=y CONFIG_JOLIET=y CONFIG_PROC_KCORE=y diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig index 30a6eafdb1d0..7e987d6f5e34 100644 --- a/arch/mips/configs/decstation_defconfig +++ b/arch/mips/configs/decstation_defconfig @@ -140,7 +140,6 @@ CONFIG_EXT2_FS_SECURITY=y CONFIG_EXT3_FS=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -# CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_ISO9660_FS=y CONFIG_JOLIET=y CONFIG_PROC_KCORE=y diff --git a/arch/mips/configs/decstation_r4k_defconfig b/arch/mips/configs/decstation_r4k_defconfig index e2b58dbf4aa9..6df5f6f2ac8e 100644 --- a/arch/mips/configs/decstation_r4k_defconfig +++ b/arch/mips/configs/decstation_r4k_defconfig @@ -140,7 +140,6 @@ CONFIG_EXT2_FS_SECURITY=y CONFIG_EXT3_FS=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y -# CONFIG_MANDATORY_FILE_LOCKING is not set CONFIG_ISO9660_FS=y CONFIG_JOLIET=y CONFIG_PROC_KCORE=y From patchwork Thu Dec 16 09:44:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 12696423 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7ED23C433EF for ; Thu, 16 Dec 2021 09:58:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=zJpkYj2yg25HbGqxoOCGgr8SwJXFuyOuR5RX0xvHoQE=; b=nlDwOiOveFpHg9 Gy7MpoQRHj11XyqXZA8ro4oiUAiGnf67Z9iGJZcac65kWk6oFdlpC/38zikdnxlwQJSTr4hf/zva6 GycRAQ6yUMuxEq32dtfNVasJrODfkp3MqlwtBq+QxVbgOZIw/8gULnJIIzvJX+vjOn3Zw3uFjjcAa hXyTnLatbce4oAL+kfa7esEWiBYvPONqCSwJ+CMFYXmJe+zFmq7HU8vqfnkV5zhIFZI461KYbuPBg bw8qGK4ZDKcAzBy3zrRGH8GKuPIAe68F0Vkgi527azkhj31tIa4CRFZslkm/SqF4w74hBYTOFD76a 5RznC+G99LIQOSeZ32Qw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxnUT-004eie-MI; Thu, 16 Dec 2021 09:55:57 +0000 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxnOl-004bs8-Dc for linux-arm-kernel@lists.infradead.org; Thu, 16 Dec 2021 09:50:05 +0000 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 1950C3FFD7 for ; Thu, 16 Dec 2021 09:50:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1639648202; bh=UE9qVdLRJW7bpl/DPmIb38u9EtZ1GCmDXsqavcnm0Z0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oBfC3JBc6AEea/1FbtHiplONMLL0/cNjgqzMII6wdO+oPBMNmBLgvn8W+8JLMTRWF OffGRMmWIXakFC7LFbDnOFuPSRigku18V1QxrE8E+WABbfGW3p8C5Yk/i+xHjZ/Rkl kFmZsg8uoK8hGtm8UMOP7a2cDf+6QND8kx/Wz6pVR7S6zBvCDMwTpbno1kJcGjcryH 5ohwGtCyo7lsuNqIR5ynX/XIodh81uiTOYf4InAIrwpYRELs4pyLOA2qZtBvxZaBSz 94gUaY38teD30Y7DmAXfAbSFwPQ3mvFWuyfFQ9izKt+6yANfA672N9eI6qKEcgLzyN rnF2c8ypgozrw== Received: by mail-wr1-f69.google.com with SMTP id c16-20020adfa310000000b001a2349890e1so951633wrb.0 for ; Thu, 16 Dec 2021 01:50:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UE9qVdLRJW7bpl/DPmIb38u9EtZ1GCmDXsqavcnm0Z0=; b=d1Fgzqx9GH5QzatQqdnBZzSxdGAAlelqT1HF3AHyj3qxJaK0cjls7Sn92ZNWwuwHBL 2EQOGTowHaEmW4MyZjiTYcYN9kXSENzDwha3Z2ZQVRnqBagXwOUpY/ok6LBGOuwDMhny GOzImpTrKtZibAT+xoa50vb8BGFIvgjXtqEVwMGAftcQ4BmQqJWJpmjg0By+q4SEhDpV ARdfH+lG+f8pjMVXXm5kIAQd4j3fAWfdamrgD9dASvAfoBFrTmCsyiezG5UUPD5I2oLn n+DUgDrpMnAiYK9ftkCMiNS2ig6NYSAT4uErCCrcgX8+yx36VyOV/KtvjBGryEliWkFz Qmgw== X-Gm-Message-State: AOAM533pLtjlKCRh86hpdU9O615lK33OYfNOMJEWT3CPd0dwXfbSHVqK iAq6nvAWH0B6Cww+35MvzS9Qq5a+yeGOJgmvWuIpuehha+dpZ3PFmAkOBBOKboRCAXGSm1kepUo dcsczbYBR80iGFRJ+5VV4RYnCZU+M5AL3oGyRtkHW0NkD/46zOrO8 X-Received: by 2002:a05:6000:1d1:: with SMTP id t17mr2381561wrx.569.1639648200618; Thu, 16 Dec 2021 01:50:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJx/xLlJnCExECCDNoAM44eP9543vxxsGpjhjfHYoFuaFs3LQSghst7DJCdkhsW2zDOpmEE8rA== X-Received: by 2002:a05:6000:1d1:: with SMTP id t17mr2381544wrx.569.1639648200429; Thu, 16 Dec 2021 01:50:00 -0800 (PST) Received: from alex.home (lfbn-gre-1-195-1.w90-112.abo.wanadoo.fr. [90.112.158.1]) by smtp.gmail.com with ESMTPSA id k6sm3892637wmj.16.2021.12.16.01.49.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 01:50:00 -0800 (PST) From: Alexandre Ghiti To: Steve French , Jonathan Corbet , David Howells , Russell King , Thomas Bogendoerfer , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Yoshinori Sato , Rich Felker , Matti Vaittinen , Lee Jones , Jeff Layton , Greg Kroah-Hartman , Arnd Bergmann , Ronnie Sahlberg , Guenter Roeck , Wim Van Sebroeck , Lukas Bulwahn , Luis Chamberlain , Kalle Valo , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-cachefs@redhat.com, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-power@fi.rohmeurope.com Cc: Alexandre Ghiti Subject: [PATCH v2 5/6] Documentation, arch, fs: Remove leftovers from fscache object list Date: Thu, 16 Dec 2021 10:44:25 +0100 Message-Id: <20211216094426.2083802-6-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> References: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211216_015003_645493_24FBC77C X-CRM114-Status: GOOD ( 19.79 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org A few references to the fscache object list were left in the Documentation, some arch defconfigs and in fs: remove them since this config does not exists anymore. Fixes: 58f386a73f16 ("fscache: Remove the object list procfile") Signed-off-by: Alexandre Ghiti Acked-by: Arnd Bergmann [arch/arm/configs] --- Documentation/filesystems/caching/fscache.rst | 89 ------------------- arch/arm/configs/axm55xx_defconfig | 1 - fs/fscache/object.c | 3 - fs/fscache/proc.c | 12 --- 4 files changed, 105 deletions(-) diff --git a/Documentation/filesystems/caching/fscache.rst b/Documentation/filesystems/caching/fscache.rst index 66e31a6d1070..7cedab444947 100644 --- a/Documentation/filesystems/caching/fscache.rst +++ b/Documentation/filesystems/caching/fscache.rst @@ -411,95 +411,6 @@ proc file. +--------------+-------+-------------------------------------------------------+ - -Object List -=========== - -If CONFIG_FSCACHE_OBJECT_LIST is enabled, the FS-Cache facility will maintain a -list of all the objects currently allocated and allow them to be viewed -through:: - - /proc/fs/fscache/objects - -This will look something like:: - - [root@andromeda ~]# head /proc/fs/fscache/objects - OBJECT PARENT STAT CHLDN OPS OOP IPR EX READS EM EV F S | NETFS_COOKIE_DEF TY FL NETFS_DATA OBJECT_KEY, AUX_DATA - ======== ======== ==== ===== === === === == ===== == == = = | ================ == == ================ ================ - 17e4b 2 ACTV 0 0 0 0 0 0 7b 4 0 0 | NFS.fh DT 0 ffff88001dd82820 010006017edcf8bbc93b43298fdfbe71e50b57b13a172c0117f38472, e567634700000000000000000000000063f2404a000000000000000000000000c9030000000000000000000063f2404a - 1693a 2 ACTV 0 0 0 0 0 0 7b 4 0 0 | NFS.fh DT 0 ffff88002db23380 010006017edcf8bbc93b43298fdfbe71e50b57b1e0162c01a2df0ea6, 420ebc4a000000000000000000000000420ebc4a0000000000000000000000000e1801000000000000000000420ebc4a - -where the first set of columns before the '|' describe the object: - - ======= =============================================================== - COLUMN DESCRIPTION - ======= =============================================================== - OBJECT Object debugging ID (appears as OBJ%x in some debug messages) - PARENT Debugging ID of parent object - STAT Object state - CHLDN Number of child objects of this object - OPS Number of outstanding operations on this object - OOP Number of outstanding child object management operations - IPR - EX Number of outstanding exclusive operations - READS Number of outstanding read operations - EM Object's event mask - EV Events raised on this object - F Object flags - S Object work item busy state mask (1:pending 2:running) - ======= =============================================================== - -and the second set of columns describe the object's cookie, if present: - - ================ ====================================================== - COLUMN DESCRIPTION - ================ ====================================================== - NETFS_COOKIE_DEF Name of netfs cookie definition - TY Cookie type (IX - index, DT - data, hex - special) - FL Cookie flags - NETFS_DATA Netfs private data stored in the cookie - OBJECT_KEY Object key } 1 column, with separating comma - AUX_DATA Object aux data } presence may be configured - ================ ====================================================== - -The data shown may be filtered by attaching the a key to an appropriate keyring -before viewing the file. Something like:: - - keyctl add user fscache:objlist @s - -where are a selection of the following letters: - - == ========================================================= - K Show hexdump of object key (don't show if not given) - A Show hexdump of object aux data (don't show if not given) - == ========================================================= - -and the following paired letters: - - == ========================================================= - C Show objects that have a cookie - c Show objects that don't have a cookie - B Show objects that are busy - b Show objects that aren't busy - W Show objects that have pending writes - w Show objects that don't have pending writes - R Show objects that have outstanding reads - r Show objects that don't have outstanding reads - S Show objects that have work queued - s Show objects that don't have work queued - == ========================================================= - -If neither side of a letter pair is given, then both are implied. For example: - - keyctl add user fscache:objlist KB @s - -shows objects that are busy, and lists their object keys, but does not dump -their auxiliary data. It also implies "CcWwRrSs", but as 'B' is given, 'b' is -not implied. - -By default all objects and all fields will be shown. - - Debugging ========= diff --git a/arch/arm/configs/axm55xx_defconfig b/arch/arm/configs/axm55xx_defconfig index b36e0b347d1f..c0ea326d4c5e 100644 --- a/arch/arm/configs/axm55xx_defconfig +++ b/arch/arm/configs/axm55xx_defconfig @@ -205,7 +205,6 @@ CONFIG_CUSE=y CONFIG_FSCACHE=y CONFIG_FSCACHE_STATS=y CONFIG_FSCACHE_DEBUG=y -CONFIG_FSCACHE_OBJECT_LIST=y CONFIG_CACHEFILES=y CONFIG_ISO9660_FS=y CONFIG_UDF_FS=y diff --git a/fs/fscache/object.c b/fs/fscache/object.c index 6a675652129b..f31257a74f35 100644 --- a/fs/fscache/object.c +++ b/fs/fscache/object.c @@ -321,9 +321,6 @@ void fscache_object_init(struct fscache_object *object, object->cookie = cookie; fscache_cookie_get(cookie, fscache_cookie_get_attach_object); object->parent = NULL; -#ifdef CONFIG_FSCACHE_OBJECT_LIST - RB_CLEAR_NODE(&object->objlist_link); -#endif object->oob_event_mask = 0; for (t = object->oob_table; t->events; t++) diff --git a/fs/fscache/proc.c b/fs/fscache/proc.c index 061df8f61ffc..4c327aeed91b 100644 --- a/fs/fscache/proc.c +++ b/fs/fscache/proc.c @@ -31,18 +31,9 @@ int __init fscache_proc_init(void) goto error_stats; #endif -#ifdef CONFIG_FSCACHE_OBJECT_LIST - if (!proc_create("fs/fscache/objects", S_IFREG | 0444, NULL, - &fscache_objlist_proc_ops)) - goto error_objects; -#endif - _leave(" = 0"); return 0; -#ifdef CONFIG_FSCACHE_OBJECT_LIST -error_objects: -#endif #ifdef CONFIG_FSCACHE_STATS remove_proc_entry("fs/fscache/stats", NULL); error_stats: @@ -60,9 +51,6 @@ int __init fscache_proc_init(void) */ void fscache_proc_cleanup(void) { -#ifdef CONFIG_FSCACHE_OBJECT_LIST - remove_proc_entry("fs/fscache/objects", NULL); -#endif #ifdef CONFIG_FSCACHE_STATS remove_proc_entry("fs/fscache/stats", NULL); #endif From patchwork Thu Dec 16 09:44:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 12696424 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C209CC433F5 for ; Thu, 16 Dec 2021 09:59:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=id2i2arqaMLBA2GXdYSs275Vix5Y7NrjfjYU5L/P25E=; b=N6lXORBLm/o7Sx gIjciH93iIPawu2KjRItaXgOKWNyxNxRgiv4PBdYVih3U7SUSyTMTf2LausZAcjNE6+lWr0R5M8A+ VxIzuZ5i9ySayDiwRjQQ1XVUrCUcRnBJQ4aIvmhg4xbyfkdBFbX7qbXG6aPeUYm8+NTchkDnF5Doj LS6HaavaguDno5/4VP3YeQXzlO4UfMMf8pwe3S+3U6mfuba6NTgVEZr38MnuHjMnyIvhtTy9+mqx+ qmCjSK0bAuMTlQI3Q84B/h1oTxZXfkl8VnJ8tWh72rJndWeyNqdIAerUOPC+qMF+BS23+SvLlXvTl Nb/cYMxlwOuMR/ttqgjw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxnVi-004fCx-8C; Thu, 16 Dec 2021 09:57:16 +0000 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxnPj-004cQ3-JJ for linux-arm-kernel@lists.infradead.org; Thu, 16 Dec 2021 09:51:05 +0000 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 3C13E3F0EB for ; Thu, 16 Dec 2021 09:51:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1639648262; bh=0bEssfmXxHPGUprNSso7Mjq6wm8EF4TYvKsU8/02BBE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UzUXNm4SELsujPBnF4AU04rs8XSKGNby+foh60JgPHbRWPXBBEEE55yPAWlNzLumb 4uovQuJFre3K7f+xEGYXYsxkotugkcP/nvLVb4FrH61ePpbH/8MVxn3mdTznCtXRgk seQu33ykbqyAo/hX2uWB4z6wfTurr48HmclDQKub1ewanjURoogb4aLH4VhX26n4j5 jVRnusmsML1z1/ntpOEzlhAPboQ3JdEYc1O1Us18Yy/fCS3EwNzDudmH/oLnujW/3t vWMS6yuiNSXHg/iO6FEkhylUm65aG/Yz4pd6Z8zPIJZ34jlEdtZbCJS3S4OKsLlBwU HMC+NEs5FOOkg== Received: by mail-wm1-f70.google.com with SMTP id bg20-20020a05600c3c9400b0033a9300b44bso10078139wmb.2 for ; Thu, 16 Dec 2021 01:51:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0bEssfmXxHPGUprNSso7Mjq6wm8EF4TYvKsU8/02BBE=; b=pkOxcY7fKdxRYxYemwGcB71+NBp0UrTLOjBf9DwU2F82Pg3A7BoYk8aZ4ki9wX0Y7p QM68N/dx4UlZ/4PstUBM3QQJj4eNHcxxXEGDGuH0+esqadsbYleDyGL7Il3dgahsKFo1 33avDyn9w2kJ44mfKAWzG6F223Fju0Ap+ft3k7oDviLNRYThD+l51L6LT/L2+rJUxDBJ 2TsRsTefn5/t/Cg+iIaulo9Yus7eIrQ6DNsq2lhZjy3vXLwAWWxpYwauYe/x+KBfT5CU njHQgf6W0hybGDFJZ8QULBikYtI1673Myo2lBff2yIm9Y0fhuFKOrHZ95ySEg/jukEli CZPA== X-Gm-Message-State: AOAM530r3Q9euqZipogfg5UoJ+rqEecf2oMp+gjoNr3d6uzeaGJ3Knq/ gNUybUZFpChoLnqDRAMu+q6+8rBd6WDshgsSbUHta5rfNB4Fa6O5p3KW+M6pG3UlesJ7yvwXZT1 1t99I8ga0VycIJKcA/PeY5trA5ZeGNvBMDRgHaqwUCCwub9lD/vkP X-Received: by 2002:adf:e0c7:: with SMTP id m7mr8388293wri.530.1639648261839; Thu, 16 Dec 2021 01:51:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzbJdsw74e1MWIrtUpFfSGPgTM99V/z0uqkAiMvhK7tPz89ydRhYflRK8+9nZRMh9H4fPR73w== X-Received: by 2002:adf:e0c7:: with SMTP id m7mr8388260wri.530.1639648261695; Thu, 16 Dec 2021 01:51:01 -0800 (PST) Received: from alex.home (lfbn-gre-1-195-1.w90-112.abo.wanadoo.fr. [90.112.158.1]) by smtp.gmail.com with ESMTPSA id a1sm5552974wri.89.2021.12.16.01.51.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 01:51:01 -0800 (PST) From: Alexandre Ghiti To: Steve French , Jonathan Corbet , David Howells , Russell King , Thomas Bogendoerfer , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Yoshinori Sato , Rich Felker , Matti Vaittinen , Lee Jones , Jeff Layton , Greg Kroah-Hartman , Arnd Bergmann , Ronnie Sahlberg , Guenter Roeck , Wim Van Sebroeck , Lukas Bulwahn , Luis Chamberlain , Kalle Valo , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-cachefs@redhat.com, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-power@fi.rohmeurope.com Cc: Alexandre Ghiti Subject: [PATCH v2 6/6] arch: Remove leftovers from prism54 wireless driver Date: Thu, 16 Dec 2021 10:44:26 +0100 Message-Id: <20211216094426.2083802-7-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> References: <20211216094426.2083802-1-alexandre.ghiti@canonical.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211216_015103_842752_3D84146E X-CRM114-Status: GOOD ( 14.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This driver was removed so remove all references to it. Fixes: d249ff28b1d8 ("intersil: remove obsolete prism54 wireless driver") Signed-off-by: Alexandre Ghiti --- arch/mips/configs/ip27_defconfig | 1 - arch/mips/configs/malta_defconfig | 1 - arch/mips/configs/malta_kvm_defconfig | 1 - arch/mips/configs/maltaup_xpa_defconfig | 1 - arch/powerpc/configs/pmac32_defconfig | 1 - 5 files changed, 5 deletions(-) diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 638d7cf5ef01..821630ac1be7 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig @@ -223,7 +223,6 @@ CONFIG_TMD_HERMES=m CONFIG_NORTEL_HERMES=m CONFIG_P54_COMMON=m CONFIG_P54_PCI=m -CONFIG_PRISM54=m CONFIG_LIBERTAS=m CONFIG_LIBERTAS_THINFIRM=m CONFIG_MWL8K=m diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 9cb2cf2595e0..3321bb576944 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig @@ -302,7 +302,6 @@ CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m -CONFIG_PRISM54=m CONFIG_LIBERTAS=m CONFIG_INPUT_MOUSEDEV=y CONFIG_MOUSE_PS2_ELANTECH=y diff --git a/arch/mips/configs/malta_kvm_defconfig b/arch/mips/configs/malta_kvm_defconfig index 5924e48fd3ec..009b30372226 100644 --- a/arch/mips/configs/malta_kvm_defconfig +++ b/arch/mips/configs/malta_kvm_defconfig @@ -310,7 +310,6 @@ CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m -CONFIG_PRISM54=m CONFIG_LIBERTAS=m CONFIG_INPUT_MOUSEDEV=y CONFIG_SERIAL_8250=y diff --git a/arch/mips/configs/maltaup_xpa_defconfig b/arch/mips/configs/maltaup_xpa_defconfig index c0d3156ef640..e214e136101c 100644 --- a/arch/mips/configs/maltaup_xpa_defconfig +++ b/arch/mips/configs/maltaup_xpa_defconfig @@ -309,7 +309,6 @@ CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_PCI=m -CONFIG_PRISM54=m CONFIG_LIBERTAS=m CONFIG_INPUT_MOUSEDEV=y CONFIG_MOUSE_PS2_ELANTECH=y diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig index 7aefac5afab0..13885ec563d1 100644 --- a/arch/powerpc/configs/pmac32_defconfig +++ b/arch/powerpc/configs/pmac32_defconfig @@ -169,7 +169,6 @@ CONFIG_USB_USBNET=m CONFIG_B43=m CONFIG_B43LEGACY=m CONFIG_P54_COMMON=m -CONFIG_PRISM54=m CONFIG_INPUT_EVDEV=y # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_MOUSE_PS2 is not set