Received-SPF: pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Mon, 9 Mar 2020 12:21:58 +0800
From:   Murphy Zhou <jencce.kernel@gmail.com>
To:     Anna Schumaker <anna.schumaker@netapp.com>,
        Trond Myklebust <trond.myklebust@hammerspace.com>
Cc:     linux-nfs@vger.kernel.org
Subject: Re: [PATCH] NFSv4.2: error out when relink swapfile
Message-ID: <20200309042158.vyuo4ghkahevsvoa@xzhoux.usersys.redhat.com>
References: <20200214143409.27etgp3gpvv7vgsz@xzhoux.usersys.redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20200214143409.27etgp3gpvv7vgsz@xzhoux.usersys.redhat.com>
Sender: linux-nfs-owner@vger.kernel.org
Precedence: bulk

On Fri, Feb 14, 2020 at 10:34:09PM +0800, Murphy Zhou wrote:
> This fixes xfstests generic/356 failure on NFSv4.2.

Ping on this one?

> 
> Signed-off-by: Murphy Zhou <jencce.kernel@gmail.com>
> ---
>  fs/nfs/nfs4file.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
> index be4eb72..993a4f0 100644
> --- a/fs/nfs/nfs4file.c
> +++ b/fs/nfs/nfs4file.c
> @@ -253,6 +253,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) {
> -- 
> 1.8.3.1
> 

-- 
Murphy