diff mbox series

[5.5,028/120] nfs: NFS_SWAP should depend on SWAP

Message ID	20200213151911.616830861@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <SRS0=Wx/U=4B=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Geert Uytterhoeven <geert+renesas@glider.be>, Anna Schumaker <Anna.Schumaker@Netapp.com> Subject: [PATCH 5.5 028/120] nfs: NFS_SWAP should depend on SWAP Date: Thu, 13 Feb 2020 07:20:24 -0800 Message-Id: <20200213151911.616830861@linuxfoundation.org> In-Reply-To: <20200213151901.039700531@linuxfoundation.org> References: <20200213151901.039700531@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.5,002/120] IB/srp: Never use immediate data if it is disabled by a user [5.5,003/120] IB/mlx5: Return the administrative GUID if exists [5.5,005/120] RDMA/netlink: Do not always generate an ACK for some netlink operations [5.5,007/120] RDMA/core: Fix locking in ib_uverbs_event_read [5.5,008/120] RDMA/uverbs: Verify MR access flags [5.5,013/120] scsi: ufs: Fix ufshcd_probe_hba() reture value in case ufshcd_scsi_add_wlus() fails [5.5,014/120] PCI/IOV: Fix memory leak in pci_iov_add_virtfn() [5.5,015/120] ath10k: pci: Only dump ATH10K_MEM_REGION_TYPE_IOREG when safe [5.5,017/120] PCI/switchtec: Fix vep_vector_number ioread width [5.5,018/120] PCI: tegra: Fix afi_pex2_ctrl reg offset for Tegra30 [5.5,020/120] PCI/AER: Initialize aer_fifo [5.5,023/120] netfilter: flowtable: fetch stats only if flow is still alive [5.5,027/120] NFSv4.x recover from pre-mature loss of openstateid [5.5,028/120] nfs: NFS_SWAP should depend on SWAP [5.5,031/120] NFS: Fix fix of show_nfs_errors [5.5,032/120] NFSv4: pnfs_roc() must use cred_fscmp() to compare creds [5.5,033/120] NFSv4: try lease recovery on NFS4ERR_EXPIRED [5.5,034/120] NFSv4.0: nfs4_do_fsinfo() should not do implicit lease renewals [5.5,036/120] bpftool: Dont crash on missing xlated program instructions [5.5,040/120] bpf: Improve bucket_log calculation logic [5.5,041/120] bpf, sockmap: Check update requirements after locking [5.5,044/120] netdevsim: disable devlink reload when resources are being used [5.5,046/120] netdevsim: use __GFP_NOWARN to avoid memalloc warning [5.5,048/120] rtc: hym8563: Return -EINVAL if the time is known to be invalid [5.5,049/120] rtc: i2c/spi: Avoid inclusion of REGMAP support when not needed [5.5,051/120] watchdog: qcom: Use platform_get_irq_optional() for bark irq [5.5,053/120] ARC: [plat-axs10x]: Add missing multicast filter number to GMAC node [5.5,055/120] arm64: dts: qcom: msm8998: Fix tcsr syscon size [5.5,056/120] arm64: dts: uDPU: fix broken ethernet [5.5,059/120] ARM: dts: am43xx: add support for clkout1 clock [5.5,060/120] arm64: dts: renesas: r8a77990: ebisu: Remove clkout-lr-synchronous from sound [5.5,061/120] arm64: dts: marvell: clearfog-gt-8k: fix switch cpu port node [5.5,063/120] ARM: dts: meson8b: use the actual frequency for the GPUs 364MHz OPP [5.5,064/120] ARM: dts: at91: sama5d3: fix maximum peripheral clock rates [5.5,069/120] powerpc/ptdump: Fix W+X verification call in mark_rodata_ro() [5.5,072/120] powerpc/pseries/vio: Fix iommu_table use-after-free refcount warning [5.5,073/120] powerpc/pseries: Allow not having ibm, hypertas-functions::hcall-multi-tce for DDW [5.5,077/120] KVM: arm/arm64: vgic-its: Fix restoration of unmapped collections [5.5,078/120] ARM: 8949/1: mm: mark free_memmap as __init [5.5,081/120] arm64: cpufeature: Fix the type of no FP/SIMD capability [5.5,085/120] KVM: arm/arm64: Fix young bit from mmu notifier [5.5,087/120] KVM: arm: Make inject_abt32() inject an external abort instead [5.5,089/120] KVM: arm64: pmu: Fix chained SW_INCR counters [5.5,091/120] arm64: nofpsmid: Handle TIF_FOREIGN_FPSTATE flag cleanly [5.5,093/120] mtd: onenand_base: Adjust indentation in onenand_read_ops_nolock [5.5,095/120] crypto: testmgr - dont try to decrypt uninitialized buffers [5.5,097/120] crypto: atmel-sha - fix error handling when setting hmac key [5.5,098/120] crypto: caam/qi2 - fix typo in algorithms driver name [5.5,099/120] drivers: watchdog: stm32_iwdg: set WDOG_HW_RUNNING at probe [5.5,101/120] i2c: cros-ec-tunnel: Fix slave device enumeration [5.5,103/120] dt-bindings: iio: adc: ad7606: Fix wrong maxItems value [5.5,105/120] bcache: avoid unnecessary btree nodes flushing in btree_flush_write() [5.5,106/120] x86/alternatives: add missing insn.h include [5.5,107/120] selinux: revert "stop passing MAY_NOT_BLOCK to the AVC upon follow_link" [5.5,111/120] pinctrl: sh-pfc: r8a7778: Fix duplicate SDSELF_B and SD1_CLK_B [5.5,112/120] pinctrl: qcom: Dont lock around irq_set_irq_wake() [5.5,116/120] dmaengine: axi-dmac: add a check for devm_regmap_init_mmio [5.5,118/120] mwifiex: Fix possible buffer overflows in mwifiex_cmd_append_vsie_tlv() [5.5,119/120] libertas: dont exit from lbs_ibss_join_existing() with RCU read lock held

Commit Message

Greg Kroah-Hartman Feb. 13, 2020, 3:20 p.m. UTC

From: Geert Uytterhoeven <geert+renesas@glider.be>

commit 474c4f306eefbb21b67ebd1de802d005c7d7ecdc upstream.

If CONFIG_SWAP=n, it does not make much sense to offer the user the
option to enable support for swapping over NFS, as that will still fail
at run time:

    # swapon /swap
    swapon: /swap: swapon failed: Function not implemented

Fix this by adding a dependency on CONFIG_SWAP.

Fixes: a564b8f0398636ba ("nfs: enable swap on NFS")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 fs/nfs/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -90,7 +90,7 @@  config NFS_V4
 config NFS_SWAP
 	bool "Provide swap over NFS support"
 	default n
-	depends on NFS_FS
+	depends on NFS_FS && SWAP
 	select SUNRPC_SWAP
 	help
 	  This option enables swapon to work on files located on NFS mounts.