UPSTREAM: Make anon_inodes unconditional

Make the anon_inodes facility unconditional so that it can be used by core
VFS code.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
(cherry picked from commit dadd2299ab61fc2b55b95b7b3a8f674cdd3b69c9)

Mot-CRs-fixed: (CR)

Bug: 135608568
Test: test program using syscall(__NR_sys_pidfd_open,..) and poll()
Change-Id: I2f97bda4f360d8d05bbb603de839717b3d8067ae
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Reviewed-on: https://gerrit.mot.com/1505850
Tested-by: Jira Key
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Reviewed-by: Wang Wang <wangwang1@lenovo.com>
Reviewed-by: Yonghui Jia <jiayh2@motorola.com>
Submit-Approved: Jira Key
Reviewed-on: https://gerrit.mot.com/1796158
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>

diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig
index f24628db540984bbff0d4274bd1b312746a6347c..14568357288524952de39c723047ebe5ef16805e 100644 (file)
--- a/arch/arm/kvm/Kconfig
+++ b/arch/arm/kvm/Kconfig
@@ -21,7 +21,6 @@ config KVM
        bool "Kernel-based Virtual Machine (KVM) support"
        depends on MMU && OF
        select PREEMPT_NOTIFIERS
-       select ANON_INODES
        select ARM_GIC
        select HAVE_KVM_CPU_RELAX_INTERCEPT
        select HAVE_KVM_ARCH_TLB_FLUSH_ALL

diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig
index 13f81f97139088cdc870b7dcbc6b990355e10865..aef1d51395da7752b5159b29b9d14d65668a0d30 100644 (file)
--- a/arch/arm64/kvm/Kconfig
+++ b/arch/arm64/kvm/Kconfig
@@ -22,7 +22,6 @@ config KVM
        depends on OF
        select MMU_NOTIFIER
        select PREEMPT_NOTIFIERS
-       select ANON_INODES
        select HAVE_KVM_CPU_RELAX_INTERCEPT
        select HAVE_KVM_ARCH_TLB_FLUSH_ALL
        select KVM_MMIO

diff --git a/arch/mips/kvm/Kconfig b/arch/mips/kvm/Kconfig
index b17447ce887314f486772c0ebde81c46ec655bd5..50e1f7f031fc7fd9cfdd310004678eeb8067cfbd 100644 (file)
--- a/arch/mips/kvm/Kconfig
+++ b/arch/mips/kvm/Kconfig
@@ -20,7 +20,6 @@ config KVM
        depends on HAVE_KVM
        select EXPORT_UASM
        select PREEMPT_NOTIFIERS
-       select ANON_INODES
        select KVM_GENERIC_DIRTYLOG_READ_PROTECT
        select KVM_MMIO
        select MMU_NOTIFIER

diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
index 648160334abf5cf7b9a4460b2e1ac9e1eed7d50f..45c6917589412c7a56910560e305ac137b3bbef1 100644 (file)
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
@@ -20,7 +20,6 @@ if VIRTUALIZATION
 config KVM
        bool
        select PREEMPT_NOTIFIERS
-       select ANON_INODES
        select HAVE_KVM_EVENTFD
        select SRCU
        select KVM_VFIO

diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig
index 9a4594e0a1ffe2a79b8f8233351f2c2b96b1b438..76a76f99e4d9d90565d67e9d30ebdcabc180a6c5 100644 (file)
--- a/arch/s390/kvm/Kconfig
+++ b/arch/s390/kvm/Kconfig
@@ -21,7 +21,6 @@ config KVM
        prompt "Kernel-based Virtual Machine (KVM) support"
        depends on HAVE_KVM
        select PREEMPT_NOTIFIERS
-       select ANON_INODES
        select HAVE_KVM_CPU_RELAX_INTERCEPT
        select HAVE_KVM_EVENTFD
        select KVM_ASYNC_PF

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 8fec1585ac7ab85be14d69a27fee4949a92a80c4..c885051a708b95124b2e6808767765843b34df34 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -43,7 +43,6 @@ config X86
        #
        select ACPI_LEGACY_TABLES_LOOKUP        if ACPI
        select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
-       select ANON_INODES
        select ARCH_CLOCKSOURCE_DATA
        select ARCH_DISCARD_MEMBLOCK
        select ARCH_HAS_ACPI_TABLE_UPGRADE      if ACPI

diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
index 3df51c28784428ed111e065595ed9e59ef376933..2fa316aa49605bdb8deaff7b7b39080882bb7bf1 100644 (file)
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -27,7 +27,6 @@ config KVM
        depends on X86_LOCAL_APIC
        select PREEMPT_NOTIFIERS
        select MMU_NOTIFIER
-       select ANON_INODES
        select HAVE_KVM_IRQCHIP
        select HAVE_KVM_IRQFD
        select IRQ_BYPASS_MANAGER

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 49fd50fccd48bef76feb90bce09f6f78fe3e0e5f..2819b8a51fd0d8fe099d45e7a0bbfa0f3a1c1a4c 100644 (file)
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -248,7 +248,6 @@ source "drivers/base/regmap/Kconfig"
 config DMA_SHARED_BUFFER
        bool
        default n
-       select ANON_INODES
        select IRQ_WORK
        help
          This option enables the framework for buffer-sharing between

diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
index a30352202f1fdc53f411d1bd6a31ef6386612570..bde9e308c51322756a236b6919e6be0f6c0d8bb9 100644 (file)
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
@@ -146,7 +146,6 @@ config TCG_CRB
 config TCG_VTPM_PROXY
        tristate "VTPM Proxy Interface"
        depends on TCG_TPM
-       select ANON_INODES
        ---help---
          This driver proxies for an emulated TPM (vTPM) running in userspace.
          A device /dev/vtpmx is provided that creates a device pair

diff --git a/drivers/dma-buf/Kconfig b/drivers/dma-buf/Kconfig
index a7c17ac1c78ae4875570c5cdf3db644a63c86925..fd57d65d6b8a70f8c32a5d0e5ba953e1b7057435 100644 (file)
--- a/drivers/dma-buf/Kconfig
+++ b/drivers/dma-buf/Kconfig
@@ -3,7 +3,6 @@ menu "DMABUF options"
 config SYNC_FILE
        bool "Explicit Synchronization Framework"
        default n
-       select ANON_INODES
        select DMA_SHARED_BUFFER
        ---help---
          The Sync File Framework adds explicit syncronization via

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 687f7bfd988947ec03d3592aa91d26f54848fd52..7da53f9dd24539fa45c4d65c877738fd2ab1707e 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -12,7 +12,6 @@ config ARCH_HAVE_CUSTOM_GPIO_H
 
 menuconfig GPIOLIB
        bool "GPIO Support"
-       select ANON_INODES
        help
          This enables GPIO support through the generic GPIO library.
          You only need to enable this, if you also want to enable

diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
index b3c8c6ef0dff33081e5d210f8df1c2090fb9721e..cda21e7f83115c8dc0a973e4e471d1f84a02bf8c 100644 (file)
--- a/drivers/iio/Kconfig
+++ b/drivers/iio/Kconfig
@@ -4,7 +4,6 @@
 
 menuconfig IIO
        tristate "Industrial I/O support"
-       select ANON_INODES
        help
          The industrial I/O subsystem provides a unified framework for
          drivers for many different types of embedded sensors using a

diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index 27b3c39e586afbfc3b04787006b4585ac91aa3f7..1e257a39b2474150b64492d9884f7d3153ea2f00 100644 (file)
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -24,7 +24,6 @@ config INFINIBAND_USER_MAD
 
 config INFINIBAND_USER_ACCESS
        tristate "InfiniBand userspace access (verbs and CM)"
-       select ANON_INODES
        ---help---
          Userspace InfiniBand access support.  This enables the
          kernel side of userspace verbs and the userspace

diff --git a/drivers/vfio/Kconfig b/drivers/vfio/Kconfig
index c84333eb5eb59bef3ab1ee41b7aea6e0ee982c75..9aa91e736023976239765d29b6d102d59062acc9 100644 (file)
--- a/drivers/vfio/Kconfig
+++ b/drivers/vfio/Kconfig
@@ -22,7 +22,6 @@ menuconfig VFIO
        tristate "VFIO Non-Privileged userspace driver framework"
        depends on IOMMU_API
        select VFIO_IOMMU_TYPE1 if (X86 || S390 || ARM_SMMU || ARM_SMMU_V3)
-       select ANON_INODES
        help
          VFIO provides a framework for secure userspace device drivers.
          See Documentation/vfio.txt for more details.

diff --git a/fs/Makefile b/fs/Makefile
index cc438741a13d8ed848ad8a0794de4b295c65c223..c20f9026e573c2979e2426976f9bf8c517209767 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -24,7 +24,7 @@ obj-$(CONFIG_PROC_FS) += proc_namespace.o
 
 obj-y                          += notify/
 obj-$(CONFIG_EPOLL)            += eventpoll.o
-obj-$(CONFIG_ANON_INODES)      += anon_inodes.o
+obj-y                          += anon_inodes.o
 obj-$(CONFIG_SIGNALFD)         += signalfd.o
 obj-$(CONFIG_TIMERFD)          += timerfd.o
 obj-$(CONFIG_EVENTFD)          += eventfd.o

diff --git a/fs/notify/fanotify/Kconfig b/fs/notify/fanotify/Kconfig
index e5f911bd80d2488689966cfd9cddf704fae07aa2..390827fa82efe2967abe2af1d8c0b7e35f172009 100644 (file)
--- a/fs/notify/fanotify/Kconfig
+++ b/fs/notify/fanotify/Kconfig
@@ -1,7 +1,6 @@
 config FANOTIFY
        bool "Filesystem wide access notification"
        select FSNOTIFY
-       select ANON_INODES
        default n
        ---help---
           Say Y here to enable fanotify support.  fanotify is a file access

diff --git a/fs/notify/inotify/Kconfig b/fs/notify/inotify/Kconfig
index b981fc0c8379d143eee7a0207ca6cd0fc69a3329..0161c74e76e260c5a9cf221250bed53d6346add5 100644 (file)
--- a/fs/notify/inotify/Kconfig
+++ b/fs/notify/inotify/Kconfig
@@ -1,6 +1,5 @@
 config INOTIFY_USER
        bool "Inotify support for userspace"
-       select ANON_INODES
        select FSNOTIFY
        default y
        ---help---

diff --git a/init/Kconfig b/init/Kconfig
index 92ae180bb084e0d586b6250d0827126ff28e14e0..72e47580062de1835d48e55e0a988c61e013d552 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1205,9 +1205,6 @@ endchoice
 config SYSCTL
        bool
 
-config ANON_INODES
-       bool
-
 config HAVE_UID16
        bool
 
@@ -1447,14 +1444,12 @@ config HAVE_FUTEX_CMPXCHG
 config EPOLL
        bool "Enable eventpoll support" if EXPERT
        default y
-       select ANON_INODES
        help
          Disabling this option will cause the kernel to be built without
          support for epoll family of system calls.
 
 config SIGNALFD
        bool "Enable signalfd() system call" if EXPERT
-       select ANON_INODES
        default y
        help
          Enable the signalfd() system call that allows to receive signals
@@ -1464,7 +1459,6 @@ config SIGNALFD
 
 config TIMERFD
        bool "Enable timerfd() system call" if EXPERT
-       select ANON_INODES
        default y
        help
          Enable the timerfd() system call that allows to receive timer
@@ -1474,7 +1468,6 @@ config TIMERFD
 
 config EVENTFD
        bool "Enable eventfd() system call" if EXPERT
-       select ANON_INODES
        default y
        help
          Enable the eventfd() system call that allows to receive both
@@ -1485,7 +1478,6 @@ config EVENTFD
 # syscall, maps, verifier
 config BPF_SYSCALL
        bool "Enable bpf() system call"
-       select ANON_INODES
        select BPF
        default n
        help
@@ -1530,7 +1522,6 @@ config ADVISE_SYSCALLS
 
 config USERFAULTFD
        bool "Enable userfaultfd() system call"
-       select ANON_INODES
        depends on MMU
        help
          Enable the userfaultfd() system call that allows to intercept and
@@ -1589,7 +1580,6 @@ config PERF_EVENTS
        bool "Kernel performance events and counters"
        default y if PROFILING
        depends on HAVE_PERF_EVENTS
-       select ANON_INODES
        select IRQ_WORK
        select SRCU
        help