2020-02-14 14:34:45

by Murphy Zhou

Subject: [PATCH] NFSv4.2: error out when relink swapfile

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

Signed-off-by: Murphy Zhou <[email protected]>
---
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

2020-03-09 04:22:34

by Murphy Zhou

Subject: Re: [PATCH] NFSv4.2: error out when relink swapfile

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 <[email protected]>
> ---
> 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