Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1946053ybv; Fri, 14 Feb 2020 08:40:26 -0800 (PST) X-Google-Smtp-Source: APXvYqx7zCx3zrUKgig9O9mfdByBzMcB8RfPi929dlCBnIoUyaa3I/KuSvBMHWiZoCAf6WG5Xjvm X-Received: by 2002:a05:6830:1e2b:: with SMTP id t11mr3029081otr.81.1581698426292; Fri, 14 Feb 2020 08:40:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581698426; cv=none; d=google.com; s=arc-20160816; b=UZQEeiReuyfJZMvhVMwRXJULyViCXiFuo7DdGqoZQOW3JQY+3qpQsr1cUi13lLZMfw CmkpNx85QWarLu0j2juLun4nqU1/2t1oykQPzyk8BNx0J8fEcjaaduVdUoobQbyeh7nn y6gfy9P8C22b6M8xIenrMwIVCLphy7I15ct26/068CLY2ZMhsO27+xgb976TSzlTFqAs ZTU1H/+rELkfGtrL4CP1Cz3i/Lawr62Fk+KuPUtGI4HPQ/+QxfIyihQ8Jqemz1GcgEnr LoJlchF9onsGf0ojv97TSG06RTKRCdawTUSJjX4kLk11AglavbBgi319XsUuhDBaz1Rm JZVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jsjMoJoLD35U7KjVuI1cEsPnLL+Dn1S96NY72LofbeY=; b=v8lPYuMpJK2HGi48oLB27ch7zBLPkrwjSLNaeQNODjzn7FTaqjtxrAPSZeRDtdFNDq odNAEBbY2pSMl5ke58LHneGlDDh1y1NeLMcOLyF90c/n1rYxGGjKd/NMOTffk2JTN47v Qx03WuLn+cFAIln+k+6tnBvi0uSim4a8DZJ2sFN2vGI8GETdYF5CnLzhreq/n3ifBK4u ChC1KKUArAtbOHwPKoGJz/EaWE63RIiDwa0DmgWRTdYfZ6eteW7F40AE24WMdYY+tXLT PAR7T68UFvFk9GSuuKRgRBCGefFnoZTJSZY0ohbbLekM0Bt2ZfaBnea4AMTjbXdXObys a9hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WXKJDCpc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m85si2926300oig.158.2020.02.14.08.40.13; Fri, 14 Feb 2020 08:40:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WXKJDCpc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405578AbgBNQXR (ORCPT + 99 others); Fri, 14 Feb 2020 11:23:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:56734 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393095AbgBNQVu (ORCPT ); Fri, 14 Feb 2020 11:21:50 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E73CC246B8; Fri, 14 Feb 2020 16:21:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581697309; bh=yi9QOP/il3GJcu7Kn35kfDf8jWGVv+A/VKq1CrPmysg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WXKJDCpcMoI0p4PXTrVbzKt2gQEXQgr9teWc+lKc6mRtyLl9gbfgXDDoXVQCOlKPY aohQpm0VDM5Tjn7PVYcbDl/kYDhR+ogOIGnjP64xn3wYErjIt0FQdaRTiTVaH3R/Ym JhxCoiF/iBmk+1PnjBI1IRiFkLJlkPlZUPb7xXy4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Geert Uytterhoeven , Anna Schumaker , Sasha Levin , linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 021/141] nfs: NFS_SWAP should depend on SWAP Date: Fri, 14 Feb 2020 11:19:21 -0500 Message-Id: <20200214162122.19794-21-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214162122.19794-1-sashal@kernel.org> References: <20200214162122.19794-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Geert Uytterhoeven [ Upstream commit 474c4f306eefbb21b67ebd1de802d005c7d7ecdc ] 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 Signed-off-by: Anna Schumaker Signed-off-by: Sasha Levin --- fs/nfs/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig index b1daeafbea920..c3428767332c2 100644 --- a/fs/nfs/Kconfig +++ b/fs/nfs/Kconfig @@ -89,7 +89,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. -- 2.20.1