From owner-svn-src-projects@freebsd.org Fri Oct 25 04:44:17 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 E0AD2165F9A for ; Fri, 25 Oct 2019 04:44:17 +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 46zs2n5dhLz43DN; Fri, 25 Oct 2019 04:44:17 +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 A45B721378; Fri, 25 Oct 2019 04:44:17 +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 x9P4iHSC043332; Fri, 25 Oct 2019 04:44:17 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9P4iH0Y043331; Fri, 25 Oct 2019 04:44:17 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201910250444.x9P4iH0Y043331@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Fri, 25 Oct 2019 04:44:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r354061 - projects/nfsv42/sys/fs/nfsserver X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfsv42/sys/fs/nfsserver X-SVN-Commit-Revision: 354061 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, 25 Oct 2019 04:44:17 -0000 Author: rmacklem Date: Fri Oct 25 04:44:17 2019 New Revision: 354061 URL: https://svnweb.freebsd.org/changeset/base/354061 Log: Return the correct error for Seek at EOF. The Linux NFSv4.2 client expects an NFSERR_NXIO error to be returned when a NFS4_CONTENT_DATA request with sa_offset == file_size is done for Seek. (This is not actually what RFC-7862 says is the correct reply for this operation request, so it is only done when vfs.nfsd.linux42server is set.) Anyhow, without this patch the code erroeously returned NFSERR_INVAL. Modified: projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c Modified: projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c ============================================================================== --- projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c Fri Oct 25 01:10:08 2019 (r354060) +++ projects/nfsv42/sys/fs/nfsserver/nfs_nfsdserv.c Fri Oct 25 04:44:17 2019 (r354061) @@ -5478,7 +5478,7 @@ nfsrvd_seek(struct nfsrv_descript *nd, __unused int is vrele(vp); if (nd->nd_repstat == 0 && eof && content == NFSV4CONTENT_DATA && nfsrv_linux42server != 0) - nd->nd_repstat = NFSERR_INVAL; + nd->nd_repstat = NFSERR_NXIO; if (nd->nd_repstat == 0) { NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED + NFSX_HYPER); if (eof)