From owner-svn-src-projects@freebsd.org Fri Oct 4 02:04:33 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 15D99146AA3 for ; Fri, 4 Oct 2019 02:04:33 +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 46ktV86nwnz3Hrj; Fri, 4 Oct 2019 02:04:32 +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 CDF0C1D47D; Fri, 4 Oct 2019 02:04:32 +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 x9424W0m064836; Fri, 4 Oct 2019 02:04:32 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9424Wvd064835; Fri, 4 Oct 2019 02:04:32 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201910040204.x9424Wvd064835@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 02:04:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r353090 - 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: 353090 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 02:04:33 -0000 Author: rmacklem Date: Fri Oct 4 02:04:32 2019 New Revision: 353090 URL: https://svnweb.freebsd.org/changeset/base/353090 Log: Flush writes in the NFSv4.2 client before doing a Seek operation. For a Seek operation to work correctly on a NFSv4.2 server, the file must be up to date on the server. So, flush writes to the server before doing the Seek 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 02:04:18 2019 (r353089) +++ projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c Fri Oct 4 02:04:32 2019 (r353090) @@ -3700,7 +3700,7 @@ nfs_ioctl(struct vop_ioctl_args *ap) struct nfsvattr nfsva; struct nfsmount *nmp; int attrflag, content, error, ret; - bool eof; + bool eof = false; /* shut up compiler. */ if (vp->v_type != VREG) return (ENOTTY); @@ -3729,8 +3729,11 @@ nfs_ioctl(struct vop_ioctl_args *ap) if (*((off_t *)ap->a_data) >= VTONFS(vp)->n_size) error = ENXIO; else { - error = nfsrpc_seek(vp, (off_t *)ap->a_data, &eof, content, - ap->a_cred, &nfsva, &attrflag); + /* Flush all writes, so that the server is up to date. */ + error = ncl_flush(vp, MNT_WAIT, ap->a_td, 1, 0); + if (error == 0) + error = nfsrpc_seek(vp, (off_t *)ap->a_data, &eof, + content, ap->a_cred, &nfsva, &attrflag); /* If at eof for FIOSEEKDATA, return ENXIO. */ if (eof && error == 0 && content == NFSV4CONTENT_DATA) error = ENXIO;