Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp700058ybz; Wed, 15 Apr 2020 17:01:42 -0700 (PDT) X-Google-Smtp-Source: APiQypLnGBxTPhcIhm3TlOrRrpSIFEF42j+cm+C6tBDRb4zOug5rNiflwAUxbanL8lpyh8aMliSa X-Received: by 2002:a17:906:4bc4:: with SMTP id x4mr7384152ejv.201.1586995302419; Wed, 15 Apr 2020 17:01:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586995302; cv=none; d=google.com; s=arc-20160816; b=O+zcYsWnmydvY2y2ENenw7sBx51q/HkYlc1m61omLo2qv2aNJaUFM21BrNFUs3JLmf VSDfW8wjLPe+fX6F/88YQrSdJpNg5syLcFsKIDgSwq4IHbPOkw3zPr+mDz+BozOZYBs4 L+UomqN4x5s+Gv1ef5ukFkaRy7upAwVrIBAdPAuu9ucavH22JVpSBDX+woMCU2fHvTmT u9NK3BzlfOjwRD685ZzCOe4yEhFFIO1nTr9pXZkUYFvcJwlU5mBQMbvuCFUY2byRgusN pdLCPM/AAATrp5KPaEcTvfXo+xD3Fod7ni+UxLIEKHQFnkqvSxByLyCLIcCYdjuW7y9a /8dg== 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=Q90xNbTGa4prKVkdmy/tBDgdlFxzKhyadfOs9MkmQHU=; b=emtcsTqQw41+uM7ridxAdUoE0fleTlRczw/hQ0yOTHDZRuO0k3s1dYse3z20QmTeuV EnNSgwKjs/VkX380/RLuXpC7tyUgJ3xCqJbj5J9JWXAYSXLOkJLtCratkriOf1xOTaz8 RauG9+zsyEXrO2P3o0MTV2O8zFYSc5n6eCEmSUiGImTb7F8vVzKvwL+JvBTU446tizOU tHgPdyedpIYGe14TD2j8J+zywuCYNIWvUzHNPmuZSoA5AjbTOBzC4ZVpwySs0Mj9gL6q YhQj1vJ1AIxnxh3s0naACYA2m798nMou0QaF0sYMm7qpwvwIzcbBd0rHsuxdJpsovlLF Zr8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ufJFFzVn; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-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. [23.128.96.18]) by mx.google.com with ESMTP id v1si6976453edw.530.2020.04.15.17.01.18; Wed, 15 Apr 2020 17:01:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ufJFFzVn; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-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 S2897076AbgDONNO (ORCPT + 99 others); Wed, 15 Apr 2020 09:13:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:55038 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2897052AbgDOLf1 (ORCPT ); Wed, 15 Apr 2020 07:35:27 -0400 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 9317D20775; Wed, 15 Apr 2020 11:35:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586950527; bh=0mz/Y/XDqS62jM3Y3+Il9l69KDQU3zU3El4aqkaNenE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ufJFFzVnAz+B+qIpg974WyDV/3uqARZQ3vs0jk2QG+0qXewdnnICk22gclG8jGBEF IN+vXPbrdcYBZM4zdR2+FFUVybi18KTlElftyrBL3GVL5Uxk+JdgkzjDkvODiOAsAv BcZARpvUX2wEGZ/f85to35LsESyjzyeeAHuW1rrs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Murphy Zhou , Trond Myklebust , Sasha Levin , linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 5.6 036/129] NFSv4.2: error out when relink swapfile Date: Wed, 15 Apr 2020 07:33:11 -0400 Message-Id: <20200415113445.11881-36-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200415113445.11881-1-sashal@kernel.org> References: <20200415113445.11881-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Murphy Zhou [ Upstream commit f5fdf1243fb750598b46305dd03c553949cfa14f ] This fixes xfstests generic/356 failure on NFSv4.2. Signed-off-by: Murphy Zhou Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/nfs4file.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c index 1297919e0fce3..8e5d6223ddd35 100644 --- a/fs/nfs/nfs4file.c +++ b/fs/nfs/nfs4file.c @@ -252,6 +252,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) { -- 2.20.1