diff mbox series

[5.4,052/118] NFSv4.2: error out when relink swapfile

Message ID	20200422095040.570318881@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <SRS0=aqQR=6G=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, Murphy Zhou <jencce.kernel@gmail.com>, Trond Myklebust <trond.myklebust@hammerspace.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.4 052/118] NFSv4.2: error out when relink swapfile Date: Wed, 22 Apr 2020 11:56:53 +0200 Message-Id: <20200422095040.570318881@linuxfoundation.org> In-Reply-To: <20200422095031.522502705@linuxfoundation.org> References: <20200422095031.522502705@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.4,002/118] watchdog: sp805: fix restart handler [5.4,005/118] arm, bpf: Fix offset overflow for BPF_MEM BPF_DW [5.4,006/118] objtool: Fix switch table detection in .text.unlikely [5.4,009/118] ARM: dts: imx6: Use gpc for FEC interrupt controller to fix wake on LAN. [5.4,010/118] kbuild, btf: Fix dependencies for DEBUG_INFO_BTF [5.4,012/118] irqchip/mbigen: Free msi_desc on device teardown [5.4,013/118] ALSA: hda: Dont release card at firmware loading error [5.4,017/118] of: unittest: kmemleak in of_unittest_overlay_high_level() [5.4,018/118] of: overlay: kmemleak in dup_and_fixup_symbol_prop() [5.4,021/118] x86/Hyper-V: Report crash register data or kmsg before running crash kernel [5.4,024/118] afs: Fix missing XDR advance in xdr_decode_{AFS,YFS}FSFetchStatus() [5.4,025/118] afs: Fix decoding of inline abort codes from version 1 status records [5.4,026/118] afs: Fix rename operation status delivery [5.4,029/118] block, bfq: turn put_queue into release_process_ref in __bfq_bic_change_cgroup [5.4,031/118] block, bfq: invoke flush_idle_tree after reparent_active_queues in pd_offline [5.4,032/118] rbd: avoid a deadlock on header_rwsem when flushing notifies [5.4,034/118] x86/Hyper-V: Free hv_panic_page when fail to register kmsg dump [5.4,035/118] drm/ttm: flush the fence on the bo after we individualize the reservation object [5.4,036/118] clk: Dont cache errors from clk_ops::get_phase() [5.4,038/118] net/mlx5e: Enforce setting of a single FEC mode [5.4,040/118] ARM: dts: rockchip: fix vqmmc-supply property name for rk3188-bqedison2qc [5.4,041/118] arm64: dts: allwinner: a64: Fix display clock register range [5.4,043/118] clk: tegra: Fix Tegra PMC clock out parents [5.4,045/118] arm64: tegra: Fix Tegra194 PCIe compatible string [5.4,049/118] rtc: 88pm860x: fix possible race condition [5.4,050/118] NFS: alloc_nfs_open_context() must use the file cred when available [5.4,052/118] NFSv4.2: error out when relink swapfile [5.4,053/118] ARM: dts: rockchip: fix lvds-encoder ports subnode for rk3188-bqedison2qc [5.4,055/118] f2fs: fix to show norecovery mount option [5.4,056/118] phy: uniphier-usb3ss: Add Pro5 support [5.4,059/118] f2fs: Add a new CP flag to help fsck fix resize SPO issues [5.4,060/118] s390/cpuinfo: fix wrong output when CPU0 is offline [5.4,063/118] powerpc/prom_init: Pass the "os-term" message to hypervisor [5.4,065/118] s390/cpum_sf: Fix wrong page count in error message [5.4,069/118] mm/hugetlb: fix build failure with HUGETLB_PAGE but not HUGEBTLBFS [5.4,070/118] drm/nouveau/svm: check for SVM initialized before migrating [5.4,071/118] drm/nouveau/svm: fix vma range check for migration [5.4,074/118] compiler.h: fix error in BUILD_BUG_ON() reporting [5.4,075/118] KVM: s390: vsie: Fix possible race when shadowing region 3 tables [5.4,076/118] drm/nouveau: workaround runpm fail by disabling PCI power management on certain int... [5.4,079/118] csky: Fixup cpu speculative execution to IO area [5.4,080/118] drm/amdkfd: kfree the wrong pointer [5.4,085/118] um: falloc.h needs to be directly included for older libc [5.4,087/118] iommu/virtio: Fix freeing of incomplete domains [5.4,088/118] iommu/vt-d: Fix mm reference leak [5.4,090/118] ext2: fix empty body warnings when -Wextra is used [5.4,092/118] iommu/vt-d: Fix page request descriptor size [5.4,095/118] csky: Fixup init_fpu compile warning with __init [5.4,096/118] power: supply: axp288_fuel_gauge: Broaden vendor check for Intel Compute Sticks. [5.4,098/118] iommu/amd: Fix the configuration of GCR3 table root pointer [5.4,099/118] f2fs: fix to wait all node page writeback [5.4,103/118] fbdev: potential information leak in do_fb_ioctl() [5.4,105/118] iio: si1133: read 24-bit signed integer for measurement [5.4,106/118] fbmem: Adjust indentation in fb_prepare_logo and fb_blank [5.4,108/118] locktorture: Print ratio of acquisitions, not failures [5.4,110/118] mtd: spinand: Explicitly use MTD_OPS_RAW to write the bad block marker to OOB [5.4,111/118] docs: Fix path to MTD command line partition parser [5.4,112/118] mtd: lpddr: Fix a double free in probe() [5.4,115/118] bpf: fix buggy r0 retval refinement for tracing helpers [5.4,117/118] bpf: Test_progs, add test to catch retval refine error handling

Commit Message

Greg Kroah-Hartman April 22, 2020, 9:56 a.m. UTC

From: Murphy Zhou <jencce.kernel@gmail.com>

[ Upstream commit f5fdf1243fb750598b46305dd03c553949cfa14f ]

This fixes xfstests generic/356 failure on NFSv4.2.

Signed-off-by: Murphy Zhou <jencce.kernel@gmail.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 fs/nfs/nfs4file.c | 3 +++
 1 file changed, 3 insertions(+)

diff mbox series

Patch

diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index 54f1c1f626fc5..fb55c04cdc6bd 100644
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -210,6 +210,9 @@  static loff_t nfs42_remap_file_range(struct file *src_file, loff_t src_off,
 	if (remap_flags & ~REMAP_FILE_ADVISORY)
 		return -EINVAL;
 
+	if (IS_SWAPFILE(dst_inode) || IS_SWAPFILE(src_inode))
+		return -ETXTBSY;
+
 	/* check alignment w.r.t. clone_blksize */
 	ret = -EINVAL;
 	if (bs) {