]> git.baikalelectronics.ru Git - kernel.git/commitdiff
NFSv4.2: error out when relink swapfile
authorMurphy Zhou <jencce.kernel@gmail.com>
Fri, 14 Feb 2020 14:34:09 +0000 (22:34 +0800)
committerTrond Myklebust <trond.myklebust@hammerspace.com>
Mon, 16 Mar 2020 14:14:30 +0000 (10:14 -0400)
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>
fs/nfs/nfs4file.c

index 1297919e0fce3173c7dee30d26d68e00a25e4125..8e5d6223ddd359917186541d70ec158888b9e515 100644 (file)
@@ -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) {