NFSv4.2: remove restriction of copy size for inter-server copy.

Currently inter-server copy is allowed only if the copy size is larger
than (rsize*14) which is the over-head of the mount operation of the
source export. This patch, relying on the delayed unmount feature,
removes this restriction since the mount and unmount overhead is now
not applicable for every inter-server copy.

Signed-off-by: Dai Ngo <dai.ngo@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index c820de58a661520aee268cebd55725f5761f32ba..c91565227ea2ab372aae379939bd918999b75d75 100644 (file)
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -158,13 +158,11 @@ static ssize_t __nfs4_copy_file_range(struct file *file_in, loff_t pos_in,
                sync = true;
 retry:
        if (!nfs42_files_from_same_server(file_in, file_out)) {
-               /* for inter copy, if copy size if smaller than 12 RPC
-                * payloads, fallback to traditional copy. There are
-                * 14 RPCs during an NFSv4.x mount between source/dest
-                * servers.
+               /*
+                * for inter copy, if copy size is too small
+                * then fallback to generic copy.
                 */
-               if (sync ||
-                       count <= 14 * NFS_SERVER(file_inode(file_in))->rsize)
+               if (sync)
                        return -EOPNOTSUPP;
                cn_resp = kzalloc(sizeof(struct nfs42_copy_notify_res),
                                GFP_NOFS);