From patchwork Fri Nov 5 15:43:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 12604949 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2BEDC433F5 for ; Fri, 5 Nov 2021 15:44:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 92E016124A for ; Fri, 5 Nov 2021 15:44:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229884AbhKEPrc (ORCPT ); Fri, 5 Nov 2021 11:47:32 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:55230 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231425AbhKEPrc (ORCPT ); Fri, 5 Nov 2021 11:47:32 -0400 Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) (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 A5DF840027 for ; Fri, 5 Nov 2021 15:44:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1636127091; bh=jHLHivxStKmmA/vK1gxbQJ1JTHvdFc1nwcxGtaT2GSQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=i98P3f/1FmYQhfMC0neDZ5FaDm8x4MUKV8uKBR0obkpcAOGBvMxFlL/46DFzOY1Sq Tdei5sSMMYGIOl+d4F7Jh05sq3sJf9Qmf840irPerxAdmtlvAzoxdpeJ/BiGXGRpRP R1mX0n8fSxYC+gGnW55eMyMXiWNlPoLk65D6J/MpjD5OcK3QTWxXJNxJrb9ODcbuVa epIGpQnpnyMwHN03SZqR400c5NgyK/xaFC4x4QCIZHUbpUZLlmnr+D8LqWkmlHkFfs qWD6S3QOTkbg7b9bDs5LdgKf+RJ3b2xSyWAeFlfGHTyuUGgRxVBZVVfC3KZXBBQKc1 0YwnuvxlPR0rQ== Received: by mail-lj1-f198.google.com with SMTP id s18-20020a2e98d2000000b00218ab148976so1334500ljj.2 for ; Fri, 05 Nov 2021 08:44:51 -0700 (PDT) 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=jHLHivxStKmmA/vK1gxbQJ1JTHvdFc1nwcxGtaT2GSQ=; b=CaM3xqD+hp5QY7j61htnosmEDrUr3hCnoexpULIeRRuUnVC1c9qk7OXSh40hXxj6cY X67QuKgjQqEVfdGmF/weZiVBqwyo49RY1SWDUdE6/VBlg3ie7ht3EEtRQ4m2jeTjXvGv /hF4rtJEIKbFhZao1ko2uTLZ8+J4Z6ZBtocdHAlEUcj6l1En6PJPz8sdPs4HkQH2bOlX ZIqtoA6gQ9MeqsvUmQTHMO/vD9YIBKHYAbX2qN9E2xu27KtIlQ5Sw67g4YPN2qGyatnd wMYwf046j2hoQd68uaBNgLHmtHSDaelaFZfKxg6zPBnaTArHEkFnfTtd3hjLUzohi2+p kA0A== X-Gm-Message-State: AOAM530WSWV7u3LUhmfcxEBOAfF5tvqukK+w1yzduUcxNkprNrQHp5p0 NK297XAcipP1XdkWyV7306QbY1FteKI0rCK0NtvRlwdHHapSCQkjBnmSZt3Yz7oLx7j/ideAqrX 7DWpDtFZRYq28n00k7EXN4Ipn4oEySan/qI1dCY8= X-Received: by 2002:adf:fb44:: with SMTP id c4mr71913809wrs.179.1636127080662; Fri, 05 Nov 2021 08:44:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwubhhFLZ1HPTor4i3ntryLRhJH9bsSukDKTrsUDEYR79CovJvijb9h2VluKlN2+0XYoTfgRg== X-Received: by 2002:adf:fb44:: with SMTP id c4mr71913748wrs.179.1636127080324; Fri, 05 Nov 2021 08:44:40 -0700 (PDT) Received: from localhost.localdomain (lfbn-lyo-1-470-249.w2-7.abo.wanadoo.fr. [2.7.60.249]) by smtp.gmail.com with ESMTPSA id l11sm8178812wrp.61.2021.11.05.08.44.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 08:44:40 -0700 (PDT) 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 1/7] Documentation, arch: Remove leftovers from fscache/cachefiles histograms Date: Fri, 5 Nov 2021 16:43:28 +0100 Message-Id: <20211105154334.1841927-2-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211105154334.1841927-1-alexandre.ghiti@canonical.com> References: <20211105154334.1841927-1-alexandre.ghiti@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.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 --- .../filesystems/caching/cachefiles.rst | 34 ------------------- Documentation/filesystems/caching/fscache.rst | 34 ++----------------- arch/arm/configs/axm55xx_defconfig | 2 -- arch/mips/configs/nlm_xlp_defconfig | 1 - arch/mips/configs/nlm_xlr_defconfig | 1 - 5 files changed, 2 insertions(+), 70 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 diff --git a/arch/mips/configs/nlm_xlp_defconfig b/arch/mips/configs/nlm_xlp_defconfig index 32c290611723..c97f00ece828 100644 --- a/arch/mips/configs/nlm_xlp_defconfig +++ b/arch/mips/configs/nlm_xlp_defconfig @@ -420,7 +420,6 @@ CONFIG_FUSE_FS=y CONFIG_CUSE=m CONFIG_FSCACHE=m CONFIG_FSCACHE_STATS=y -CONFIG_FSCACHE_HISTOGRAM=y CONFIG_CACHEFILES=m CONFIG_ISO9660_FS=m CONFIG_JOLIET=y diff --git a/arch/mips/configs/nlm_xlr_defconfig b/arch/mips/configs/nlm_xlr_defconfig index bf9b9244929e..60ea102783d9 100644 --- a/arch/mips/configs/nlm_xlr_defconfig +++ b/arch/mips/configs/nlm_xlr_defconfig @@ -372,7 +372,6 @@ CONFIG_FUSE_FS=y CONFIG_CUSE=m CONFIG_FSCACHE=m CONFIG_FSCACHE_STATS=y -CONFIG_FSCACHE_HISTOGRAM=y CONFIG_CACHEFILES=m CONFIG_ISO9660_FS=m CONFIG_JOLIET=y From patchwork Fri Nov 5 15:43:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 12604951 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 663D1C433F5 for ; Fri, 5 Nov 2021 15:45:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4FF2861245 for ; Fri, 5 Nov 2021 15:45:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232936AbhKEPse (ORCPT ); Fri, 5 Nov 2021 11:48:34 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:55352 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232864AbhKEPsd (ORCPT ); Fri, 5 Nov 2021 11:48:33 -0400 Received: from mail-lj1-f200.google.com (mail-lj1-f200.google.com [209.85.208.200]) (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 735253FFE2 for ; Fri, 5 Nov 2021 15:45:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1636127153; bh=RNobqhWtnsfIoxXaYIoZpBxYqqusSLJy7zau+vw4CD8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TZu1bZFfonmNRtp+lLLb27l2nbvyrUrt+aU96cVtuvRVa1qFwVcU64Hf72LaEZ8Ul lLNcoNWtED/y3QgX/7zgftL2+ArdH/bpS9DAQqr3d6lLtxtCpQwmvlrMWf97A3obeP YYaHzJ8hXFMHp9Yp6aDMO/kImkpmYQJ09Kn/3hozbb3OkWSIyzV4BniUsuZPUnIV2C IQbb3lvVCMwRwSYLLmYk+k2VcSaEXw+J9QpVrImK1gaxgxvg3mR/+YB9iZAIL3dbZ4 Sr6ehwYlUCOsX4OOVXg3eGxgIMBvw2zyaVyKdLaq9yjuI+iakBnrpbwQtMGP2B79ln fqyAmcVEuPGyg== Received: by mail-lj1-f200.google.com with SMTP id f17-20020a2e9751000000b00211a1367c68so3203261ljj.16 for ; Fri, 05 Nov 2021 08:45:53 -0700 (PDT) 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=RNobqhWtnsfIoxXaYIoZpBxYqqusSLJy7zau+vw4CD8=; b=gLnJpwngJnTn+aPCFHuyjVc3GngNApbHPDTkvt0OBvbIjkp6vJmvttRpc4Gc+yKkXt 3h6zTN0ONicXTEJcRnuDNVRUpa6g8b14WboSF597m8cjwZ3LSJ/GTer1t/XWPILUuXS/ tWHyefPi9VP1Lg+naxx5WWlokRHdEgug8XgXc7o6QXPNgvlw+wg51NamIEI63TTReIWC LpYnenyCHlczQa+aKhPIV8s++F6aHu4kMsP+U2wMhCKV0KlX45sloNHRDKperQZTW0To oRyDwqIuWHFOEcmDncNBxir29jRGk18Ni7WiYHMhNvpgYL4erLAKXkoWpkQKfpL9va3F MBHQ== X-Gm-Message-State: AOAM531XRCixNXVMECBnvk9nbwugrNF/zlq6PtdeiJbmVZnVlmgE5y/I OdoJpUUzLupfXMhCxTKDjSCjs8uI5ZmPft8+eiOOH/aqK+TJhF40bMK3O6Qu/tv26bBsQrX77Ul tHv/i313qjccG55SDZ3QjDe8pesEbGFSJph3JjbQ= X-Received: by 2002:a05:6000:248:: with SMTP id m8mr55189848wrz.404.1636127142091; Fri, 05 Nov 2021 08:45:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZywTZdfrBqjkrXUHT6HtmWD9YVAJ3iwmoe2pIrt2a1HLvL+5pBL/kHDbOZs7Oh5iYcqB87Q== X-Received: by 2002:a05:6000:248:: with SMTP id m8mr55189804wrz.404.1636127141914; Fri, 05 Nov 2021 08:45:41 -0700 (PDT) Received: from localhost.localdomain (lfbn-lyo-1-470-249.w2-7.abo.wanadoo.fr. [2.7.60.249]) by smtp.gmail.com with ESMTPSA id z5sm15339353wmp.26.2021.11.05.08.45.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 08:45:41 -0700 (PDT) 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 2/7] Documentation, arch: Remove leftovers from raw device Date: Fri, 5 Nov 2021 16:43:29 +0100 Message-Id: <20211105154334.1841927-3-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211105154334.1841927-1-alexandre.ghiti@canonical.com> References: <20211105154334.1841927-1-alexandre.ghiti@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.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 --- 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 b183629f1bcf..d0494fbb4961 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig @@ -190,7 +190,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 Fri Nov 5 15:43:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 12604953 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94A1CC4332F for ; Fri, 5 Nov 2021 15:46:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7D44D61183 for ; Fri, 5 Nov 2021 15:46:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233527AbhKEPtZ (ORCPT ); Fri, 5 Nov 2021 11:49:25 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:42220 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232084AbhKEPtY (ORCPT ); Fri, 5 Nov 2021 11:49:24 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.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 0ACAB3F1D5 for ; Fri, 5 Nov 2021 15:46:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1636127204; bh=AZ2gloRjaGSelBDHUs66L2AD8OBUvTDJdaiIuuRPNLk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rPq5ElgxqzrCnG9OKsMHBSdzXr7UBhwr6jESOlSe0QrDka/Jon+TIvgOfncJ4H5t/ gjRtUChjUeujAKVSn3VJ16lRSDlvAf+EGuQzV6HG+ejXfltwGlzGlLnLMhnYzXCeB8 +d/Sg41YAqQqWi3ZX+uqlrZ3KETiSmibD4de+MC7afsJakIBdpvoaYYEf7uDSqUD4Y T2p+TfxUeW5ntl9IHoBn/5lcfI7HjMgX1iOrNVGnjpfr90rzcKXHqavgJB3lF/pg4u xJ7d67t1XXiyBBpPexu5DFYPFNXpwbrOLokG5FlJDu52iwMB2LupLq9cMdOQf9u7KQ HH7PwaNQSJrRA== Received: by mail-wr1-f70.google.com with SMTP id p17-20020adff211000000b0017b902a7701so2451890wro.19 for ; Fri, 05 Nov 2021 08:46:44 -0700 (PDT) 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=AZ2gloRjaGSelBDHUs66L2AD8OBUvTDJdaiIuuRPNLk=; b=HS2ImEJKXbFUeJWGwNsg1Gg27w4vhOUgdo+dILn+Qwj6fi16aC2u8bZHjPmpY+bycE fTnon/2zayMajNunYvT6jc+dfSK9tuYnog6T12awi+MfToB0tYhShqxJDJ1pZ5OhZsap SlePjw/Qto5BB2JzOMk1d/j3OgLyTXHkD+dyKpOu4DWpWgnT6OiiMbPrpU6Ggh9H7dLz PYnkvC03+wyrmV2tDaB4YFwITswv4CFZo42I6KiXrrFrTxAAtzYzfbA4cRJrz7PbRVpb QpIzc25ME19NYuJZu6uIgi/rO4wPqpkt79WXRE2HXF+TFMZ3fk8k+M5cwD8Xde102h6d Uu8g== X-Gm-Message-State: AOAM532hxgj+cOaj0CnQWrAtglxr5AMjfcWvju92XJ0sPvpUOSqnlo/0 jc9jGbmi2yMnauddFsZR5dkD748WQiPSREqt8v2n+Xzu+BV89YbiOa6NJlLjD574683A1OoLAeN SMFcpx9kS56z5gbNq/XVfqWfzn3ZcydKnCcJk+es= X-Received: by 2002:a5d:648e:: with SMTP id o14mr36228285wri.69.1636127203639; Fri, 05 Nov 2021 08:46:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5k996q02AvLPMDT6zp/eTqKcLpYZhxXm5GjlYrXrZ8v9D6rr2qQHoIq1Cs+RM4w+4Mx4VtA== X-Received: by 2002:a5d:648e:: with SMTP id o14mr36228265wri.69.1636127203485; Fri, 05 Nov 2021 08:46:43 -0700 (PDT) Received: from localhost.localdomain (lfbn-lyo-1-470-249.w2-7.abo.wanadoo.fr. [2.7.60.249]) by smtp.gmail.com with ESMTPSA id 6sm8070834wma.48.2021.11.05.08.46.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 08:46:43 -0700 (PDT) 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 3/7] Documentation, arch: Remove leftovers from CIFS_WEAK_PW_HASH Date: Fri, 5 Nov 2021 16:43:30 +0100 Message-Id: <20211105154334.1841927-4-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211105154334.1841927-1-alexandre.ghiti@canonical.com> References: <20211105154334.1841927-1-alexandre.ghiti@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.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 --- 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/mips/configs/nlm_xlp_defconfig | 1 - arch/mips/configs/nlm_xlr_defconfig | 1 - arch/powerpc/configs/ppc6xx_defconfig | 1 - arch/sh/configs/titan_defconfig | 1 - 16 files changed, 3 insertions(+), 19 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/mips/configs/nlm_xlp_defconfig b/arch/mips/configs/nlm_xlp_defconfig index c97f00ece828..1c8b73d03263 100644 --- a/arch/mips/configs/nlm_xlp_defconfig +++ b/arch/mips/configs/nlm_xlp_defconfig @@ -459,7 +459,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/mips/configs/nlm_xlr_defconfig b/arch/mips/configs/nlm_xlr_defconfig index 60ea102783d9..11acfc173058 100644 --- a/arch/mips/configs/nlm_xlr_defconfig +++ b/arch/mips/configs/nlm_xlr_defconfig @@ -411,7 +411,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/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 Fri Nov 5 15:43:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 12604955 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FF98C433EF for ; Fri, 5 Nov 2021 15:47:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7952361262 for ; Fri, 5 Nov 2021 15:47:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233634AbhKEPu0 (ORCPT ); Fri, 5 Nov 2021 11:50:26 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:42302 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230400AbhKEPuZ (ORCPT ); Fri, 5 Nov 2021 11:50:25 -0400 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 6F0E73F1D8 for ; Fri, 5 Nov 2021 15:47:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1636127265; bh=BQNpoEejJgdqfTjT6uEW5F1j+u2r6UT1ueKsgaIRjOY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MjTTo71CHhJ1cKM+yRt59kfXecnW6C+o4ZdcvkWRrVeu0qio5WMa6m+Tlv0ARc149 cwiBPC66RZlOzOBRqgi5fNnX++yhMMSD1EmzFoMJvKhZW5BybulVx7NlGtzC8w8Q6M 9Y/quMsv1/KrdZiPXDdMIocpDfYxR2M95V5W/CROllWk0w6sPJSYA1P+XxIdX0sO7w qedy76kPSGYR4FdNljNVJBZJGOK2RO6fE/awkrwZdmDPW0TLbPbvz/SMxd/mL/gTsg B0VKXJj/YDIINr3qk6sJYQ/CjtLLEf7kAi9VN7OTjd2VSDzGgIQTVdTe2vzRjj9AeO Cj0XoVsgAVOug== Received: by mail-wm1-f70.google.com with SMTP id o18-20020a05600c511200b00332fa17a02eso3376739wms.5 for ; Fri, 05 Nov 2021 08:47:45 -0700 (PDT) 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=BQNpoEejJgdqfTjT6uEW5F1j+u2r6UT1ueKsgaIRjOY=; b=VWpXbSrOmUWwjBJdi1JkmONj5TQL33+EwQ5mfuZ1qTPokllyAcAWVyyYjnmsvbwSc0 ZV8gGH9Lv59ERVjFJfemh0+GfxaqDnAAHN23riNTyhECUfKdggQIedchbqy0v7hLJTSS m22DsWkAf26Q/Dzad1X42aD7RjqPesRzjVQpPwKfO5krLpLEs92LUnBGz7EeklHblClD 4ef5phIaP65U07Xoqt7hNGMpjhU3bLwsfYDNTq1Mm6+VkH+79mVR1YFYIr8Xs57OmCOm lT7EE3xHEY90G6EJGSAgWel3BNGHf0YN3ORfnynPC5oEfoT78wyUvTbRveVaXI40Mwng 9snw== X-Gm-Message-State: AOAM533625nY5fauEoZhfy9wZfu8kc1gIbMAQLMXtgZ6E/LaNyXhuGyX 3p3Rjho3T3ukTSsMGfM85b+LOuJ9u5rp0u3YtIeTpf8HLwxDQhl4Z4DMT2RQPSXYws/ZdiHVoZL re9Zycf929rr+LzyUtMWcowM5hQgaAzORX1HQawU= X-Received: by 2002:a05:600c:430c:: with SMTP id p12mr32522648wme.127.1636127265139; Fri, 05 Nov 2021 08:47:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyqsDazjeBLc3GzOdhywA22fmz71ZuD2zXBh7/jcJh3Kp1/GITAo9FHVASySm/M442PUPtjWg== X-Received: by 2002:a05:600c:430c:: with SMTP id p12mr32522621wme.127.1636127264973; Fri, 05 Nov 2021 08:47:44 -0700 (PDT) Received: from localhost.localdomain (lfbn-lyo-1-470-249.w2-7.abo.wanadoo.fr. [2.7.60.249]) by smtp.gmail.com with ESMTPSA id o8sm8452479wrm.67.2021.11.05.08.47.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 08:47:44 -0700 (PDT) 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 4/7] arch: Remove leftovers from mandatory file locking Date: Fri, 5 Nov 2021 16:43:31 +0100 Message-Id: <20211105154334.1841927-5-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211105154334.1841927-1-alexandre.ghiti@canonical.com> References: <20211105154334.1841927-1-alexandre.ghiti@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.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 Fri Nov 5 15:43:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 12605069 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB9C4C433FE for ; Fri, 5 Nov 2021 15:49:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 931076008E for ; Fri, 5 Nov 2021 15:49:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233671AbhKEPvk (ORCPT ); Fri, 5 Nov 2021 11:51:40 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:55716 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232774AbhKEPvb (ORCPT ); Fri, 5 Nov 2021 11:51:31 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.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 554E03FFE2 for ; Fri, 5 Nov 2021 15:48:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1636127331; bh=VvrTEBN91O2dIdKWAGceL3rqJ3wgEjcVLOB7L5ab2dw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Hjr3/dfo9SafRhqwbaYCz5bHN9t6Tf4gOcNYtHm2on0V/ZxaYrZaq3Ipy5m/jUU88 bhzUi0uAxMoHynbRLP8xppVMEJZVlm1lXcRXsD/toeH0CwDk9UXrsTnPmllrvq3Oyx ftp7Qlhx/6JMX9wlWGmBohygb6HcsGbQswa0Hu36/Kg5T4ei7mOlDlqXyOk0QArxkb Ps+zxcLboR12HmjVOEvUL+IBk99hpb4H4Al7GlnJJqBo47yJ4zMRjq2UVxw53pbQio IRtjxZCasIUm4el0GeeBhbLz0Ib74JLshVlkazSArkJePac5W0Y2z7NxiR0ozFiy+h uPgFjFM8pqPiw== Received: by mail-wm1-f71.google.com with SMTP id o10-20020a05600c4fca00b0033312e1ed8bso697320wmq.2 for ; Fri, 05 Nov 2021 08:48:51 -0700 (PDT) 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=VvrTEBN91O2dIdKWAGceL3rqJ3wgEjcVLOB7L5ab2dw=; b=KV1pI9LQnUQQD1nHhXAz64i77q33EkwfXPo77n9844VZF+wXDsMfypneEiZQyjgXYh F0HYLNT+WTHoQT9MBFApWewSLZhy8KN2eb1UJIMpVjZQAqKpjkM65LU3geBMls+2C1// HEEWL7fAVSk5CMYnbSqX03KadIjqLCJroymhBb85g35wmZjdgPd8yAxYusMtGA46pIJv GSFyW4B+QN1Ro4G8RasR6JwdrqbDkmrnOsThz1plfHlUvuTyYUnjW9BO9NxeAP66afTo wdXlPLHuZxjsPFAaF7N9vlP6UC/6+3doRRuuKeBqsFlpASV5lYEZjFHXAOOTj9bWpBox IymA== X-Gm-Message-State: AOAM533q0Uua2XgdvnvJ7B/RwStL/knXbrv/VHpesYDABvc1UHZ/qJUn WxSh+/dRPybtBQgKpQLQNQve2kKiXLo87AtqZ8ALyvEWXKEKevMLv7KxxzEgYlGfwDKNAR/eeWl tzqfa1Jt4q2/8XOqrKNHRwC0PFY3gkZxzORLrazA= X-Received: by 2002:a7b:c744:: with SMTP id w4mr26583294wmk.50.1636127328823; Fri, 05 Nov 2021 08:48:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+H1awp9nsQzNh5Wa1+qoWuVasIamkPSOv3I+AMuKf6XD4rHQ8kTYnVztdPUzEDBiWN15Kfw== X-Received: by 2002:a7b:c744:: with SMTP id w4mr26583038wmk.50.1636127326558; Fri, 05 Nov 2021 08:48:46 -0700 (PDT) Received: from localhost.localdomain (lfbn-lyo-1-470-249.w2-7.abo.wanadoo.fr. [2.7.60.249]) by smtp.gmail.com with ESMTPSA id m17sm931418wrz.22.2021.11.05.08.48.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 08:48:46 -0700 (PDT) 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 5/7] Documentation, arch, fs: Remove leftovers from fscache object list Date: Fri, 5 Nov 2021 16:43:32 +0100 Message-Id: <20211105154334.1841927-6-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211105154334.1841927-1-alexandre.ghiti@canonical.com> References: <20211105154334.1841927-1-alexandre.ghiti@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.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 --- 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 Fri Nov 5 15:43:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 12605071 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5947EC433F5 for ; Fri, 5 Nov 2021 15:50:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3EB9E6008E for ; Fri, 5 Nov 2021 15:50:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233680AbhKEPwk (ORCPT ); Fri, 5 Nov 2021 11:52:40 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:42538 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232592AbhKEPwj (ORCPT ); Fri, 5 Nov 2021 11:52:39 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.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-1.canonical.com (Postfix) with ESMTPS id 2AB6E3F1E6 for ; Fri, 5 Nov 2021 15:49:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1636127399; bh=O16OdHn+GTs4ijs6PH3u89m4wmvvKfK54fa2lozmRZs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=wMXJkKo85eDHCektuoYL6K/FwhCJ7vtpMd3O+KWr7hrHUI5pYA/VqSf7RjRhSjlHI 3ZRqYMPSiyyqokxe7sEYLViWgVEglVuyggjC4WL9gG2y/f5zy7FkOV2IJ8IPsid7Ke UNNPJpug3V3cCOxuvGj4+whwQNYieuppObGUO3D+vQ/luuyaPZkNWxdpNeEuZ/MG4Y EIJsbFboqWa4nskx7LKTb7y9sxZ3n1z8cK39BEndCFwXh4Ga3Nzayj2UhrmBRh++O3 A4y2JGgpqCGR319Ox4r4UF1YbaLjVTErpAecKDLZ8hm4uKXWJdwxH1n7StTk7cQCjC W4mybHNQW6vnA== Received: by mail-wm1-f72.google.com with SMTP id m14-20020a05600c3b0e00b0033308dcc933so2915132wms.7 for ; Fri, 05 Nov 2021 08:49:59 -0700 (PDT) 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=O16OdHn+GTs4ijs6PH3u89m4wmvvKfK54fa2lozmRZs=; b=lUqSkv/7j3Lwaz+dIiX4YHTdWHEAS2b+AKGA/1LjhK1o7DkbiXP/maFgNnYv72p3S2 0xB2/HpaQfK32ns/gvmWSU71PtcKiSYELtpFWN0C2gWQG6DSgy1qairurPxKUgoKW5sT I4+pOi1u1/rO/OnDX1j7CDRlH8vUEKLfZKG7zzqCnHtSs4Hu+R7w7AvzzaxVtslU8C9X YhDZn6kfJDn611g7iR/Gbhbt6WCmzCBgneq5He8p/7VyRU2wQlIKCx5KK0TBoy+frjpY 896ARCVsj2r1iGDn4uF6S7FsIVQP5ntcll6MNmngPaqUBLUWP/bi/IMNLH5pvgHE/26s YjYA== X-Gm-Message-State: AOAM532Z5fRzmRHkm3BJRgFEFLkKxOMYsD6GZHXJfJvk6ZqQmZXI/zZJ VN+94CrW4yBC8xTdnuS7Ad1GLyneH35aWy0oPgY1dZDTt1MPOyn8wx/sk2vikIhE/GBnTWJq8ep EuFEIQatmbA1MtPmXtYRX6bp/RmD6f0cqoybCufc= X-Received: by 2002:a5d:4a0a:: with SMTP id m10mr51023040wrq.221.1636127388422; Fri, 05 Nov 2021 08:49:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwY603x0zr+Chuyb1t2ADL8WGsBiGEq/MpdSLq2l9mjdNq6e20HunukFRMlsP5KMMQo9T/EOQ== X-Received: by 2002:a5d:4a0a:: with SMTP id m10mr51023001wrq.221.1636127388217; Fri, 05 Nov 2021 08:49:48 -0700 (PDT) Received: from localhost.localdomain (lfbn-lyo-1-470-249.w2-7.abo.wanadoo.fr. [2.7.60.249]) by smtp.gmail.com with ESMTPSA id o25sm8150426wms.17.2021.11.05.08.49.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 08:49:47 -0700 (PDT) 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 6/7] include: mfd: Remove leftovers from bd70528 watchdog Date: Fri, 5 Nov 2021 16:43:33 +0100 Message-Id: <20211105154334.1841927-7-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211105154334.1841927-1-alexandre.ghiti@canonical.com> References: <20211105154334.1841927-1-alexandre.ghiti@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org This driver was removed so remove all references to it. Fixes: 52a5502507bc ("watchdog: bd70528 drop bd70528 support") Signed-off-by: Alexandre Ghiti --- include/linux/mfd/rohm-bd70528.h | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/include/linux/mfd/rohm-bd70528.h b/include/linux/mfd/rohm-bd70528.h index 4a5966475a35..297a4a84fff5 100644 --- a/include/linux/mfd/rohm-bd70528.h +++ b/include/linux/mfd/rohm-bd70528.h @@ -362,28 +362,4 @@ enum { #define BD70528_MASK_BUCK_RAMP 0x10 #define BD70528_SIFT_BUCK_RAMP 4 -#if IS_ENABLED(CONFIG_BD70528_WATCHDOG) - -int bd70528_wdt_set(struct rohm_regmap_dev *data, int enable, int *old_state); -void bd70528_wdt_lock(struct rohm_regmap_dev *data); -void bd70528_wdt_unlock(struct rohm_regmap_dev *data); - -#else /* CONFIG_BD70528_WATCHDOG */ - -static inline int bd70528_wdt_set(struct rohm_regmap_dev *data, int enable, - int *old_state) -{ - return 0; -} - -static inline void bd70528_wdt_lock(struct rohm_regmap_dev *data) -{ -} - -static inline void bd70528_wdt_unlock(struct rohm_regmap_dev *data) -{ -} - -#endif /* CONFIG_BD70528_WATCHDOG */ - #endif /* __LINUX_MFD_BD70528_H__ */ From patchwork Fri Nov 5 15:43:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 12605073 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92821C433FE for ; Fri, 5 Nov 2021 15:51:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7A961610FD for ; Fri, 5 Nov 2021 15:51:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233665AbhKEPxo (ORCPT ); Fri, 5 Nov 2021 11:53:44 -0400 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]:55876 "EHLO smtp-relay-internal-0.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233707AbhKEPxa (ORCPT ); Fri, 5 Nov 2021 11:53:30 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.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 904FC3FE09 for ; Fri, 5 Nov 2021 15:50:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1636127450; bh=0bEssfmXxHPGUprNSso7Mjq6wm8EF4TYvKsU8/02BBE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SOZuh1jgruWyhKpzphF4MfDp205NeFT1DMV+YGxF2o/S9etbRrImfXNt5guybkFyH 4AlK3s2JOtOOf+efGDSRBcw12wAWvzdUQCr4eYrKZ91f0A8NYddClRMwISpanPH9JP QYZU6XGymXTDUtZwys835HDoSMyqrXrSLTRgdAmCrOOAwfXr5MlVhMlfA1/UHzI1Ux MDutFTSLvX1CMJBAQNTFTcy1dq/2SUAdOj9ewsvp46QdRi7QEjZwbTyF5OuQp2n/QP rriJNj5/WVrysKjrVOoYl4wHdkhp7mwnKSiaJhvQ5ylzbv6JoHZMRahRFVuqJ7Q/fa Twmj4VXhAB4qw== Received: by mail-wm1-f71.google.com with SMTP id k6-20020a7bc306000000b0030d92a6bdc7so3383756wmj.3 for ; Fri, 05 Nov 2021 08:50:50 -0700 (PDT) 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=iGnUwTWuQ3exF8fW2CpMuuwoGJePsVUUBpG25affjaqoNHG/nXlPiYhMbw3pF8VOjC b6qiSbKMbfWnwZ1ffN5TNtrkTZ4GhmgxpxVdsuTJSe1vmcH9mcW8FPmPc9akNrKViiFp 1cQAv5VRXAuLiy6cFZIvUgrsISOHFrd7aWQX00j/Cr4YQsg8dpOfWqhc1Q03ExH3JlBL KIKV8OPZ2rel94JZQJ7kGk7nbs88G2GqICdTlejWjUGKbGiwyTYMBlv2kc9EbqAP531y u9pzbcwxnI/CYfyyKo9f6kGp1UM4dgfV5Q3C/FZpfyMgGNR08/q3r/yt1Vy18lThzGxP bZcg== X-Gm-Message-State: AOAM533owtOenV4BrnmB+ccXJZX5XOdnzpEvjLEmTZWv8yU50H42Iejg vfpCBlJ+4H6hF7jIWGnDLJx0/F8gtxQ7mb8crs6r6M7vFRDwkVwBxsqthjIKRgPZAIYCDUbfPNp l3ke9bp3YlzbmVWCBD2aNPSUHYd3T49VbOelx+zA= X-Received: by 2002:a5d:468f:: with SMTP id u15mr60369034wrq.171.1636127449750; Fri, 05 Nov 2021 08:50:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyP30QeivC6b36TFL+IkuxX7YAofe7sXVJxsbORnG4EhnoSVTTf2FUxAHUW+sOGX9Deb4eenw== X-Received: by 2002:a5d:468f:: with SMTP id u15mr60368997wrq.171.1636127449594; Fri, 05 Nov 2021 08:50:49 -0700 (PDT) Received: from localhost.localdomain (lfbn-lyo-1-470-249.w2-7.abo.wanadoo.fr. [2.7.60.249]) by smtp.gmail.com with ESMTPSA id h27sm13219037wmc.43.2021.11.05.08.50.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 08:50:49 -0700 (PDT) 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 7/7] arch: Remove leftovers from prism54 wireless driver Date: Fri, 5 Nov 2021 16:43:34 +0100 Message-Id: <20211105154334.1841927-8-alexandre.ghiti@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211105154334.1841927-1-alexandre.ghiti@canonical.com> References: <20211105154334.1841927-1-alexandre.ghiti@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.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