From owner-svn-src-projects@freebsd.org Fri Oct 4 05:02:40 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 99DE6FB9AB for ; Fri, 4 Oct 2019 05:02:40 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46kyRh3W9Tz3yLB; Fri, 4 Oct 2019 05:02:40 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5BD6B1F578; Fri, 4 Oct 2019 05:02:40 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9452eq4072036; Fri, 4 Oct 2019 05:02:40 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9452eYZ072035; Fri, 4 Oct 2019 05:02:40 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201910040502.x9452eYZ072035@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Fri, 4 Oct 2019 05:02:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r353098 - projects/nfsv42/sys/fs/nfsclient X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfsv42/sys/fs/nfsclient X-SVN-Commit-Revision: 353098 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Oct 2019 05:02:40 -0000 Author: rmacklem Date: Fri Oct 4 05:02:39 2019 New Revision: 353098 URL: https://svnweb.freebsd.org/changeset/base/353098 Log: Fix the comment in the NFSv4.2 client copy_file_range. Fix the comment so that it correctly explains why both files are flushed before doing the Copy operation. Modified: projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c Modified: projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c ============================================================================== --- projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c Fri Oct 4 04:57:36 2019 (r353097) +++ projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c Fri Oct 4 05:02:39 2019 (r353098) @@ -3585,8 +3585,9 @@ nfs_copy_file_range(struct vop_copy_file_range_args *a error = vn_rlimit_fsize(outvp, &io, ap->a_fsizetd); /* - * Flush all writes for both files, so they will be up to date - * on the server before doing the copy. + * Flush the input file so that the data is up to date before + * the copy. Flush writes for the output file so that they + * do not overwrite the data copied to the output file by the Copy. */ if (error == 0) error = ncl_flush(invp, MNT_WAIT, curthread, 1, 0);