From owner-svn-src-stable@freebsd.org  Wed Oct 11 23:21:25 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D1400E3A0F9;
 Wed, 11 Oct 2017 23:21:25 +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 mx1.freebsd.org (Postfix) with ESMTPS id 9FE1981AD9;
 Wed, 11 Oct 2017 23:21:25 +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 v9BNLORd043875;
 Wed, 11 Oct 2017 23:21:24 GMT (envelope-from rmacklem@FreeBSD.org)
Received: (from rmacklem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9BNLORw043874;
 Wed, 11 Oct 2017 23:21:24 GMT (envelope-from rmacklem@FreeBSD.org)
Message-Id: <201710112321.v9BNLORw043874@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to
 rmacklem@FreeBSD.org using -f
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Wed, 11 Oct 2017 23:21:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r324543 - stable/10/sys/fs/nfsclient
X-SVN-Group: stable-10
X-SVN-Commit-Author: rmacklem
X-SVN-Commit-Paths: stable/10/sys/fs/nfsclient
X-SVN-Commit-Revision: 324543
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Oct 2017 23:21:25 -0000

Author: rmacklem
Date: Wed Oct 11 23:21:24 2017
New Revision: 324543
URL: https://svnweb.freebsd.org/changeset/base/324543

Log:
  MFC: r323689
  Fix bogus FREAD with NFSV4OPEN_ACCESSREAD. No functional change.
  
  The code in nfscl_doflayoutio() bogusly used FREAD instead of
  NFSV4OPEN_ACCESSREAD. Since both happen to be defined as "1", this
  worked and the patch doesn't result in a functional change.
  Found by inspection during development of Flex File Layout support.

Modified:
  stable/10/sys/fs/nfsclient/nfs_clrpcops.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- stable/10/sys/fs/nfsclient/nfs_clrpcops.c	Wed Oct 11 21:53:53 2017	(r324542)
+++ stable/10/sys/fs/nfsclient/nfs_clrpcops.c	Wed Oct 11 23:21:24 2017	(r324543)
@@ -5766,7 +5766,7 @@ nfscl_doflayoutio(vnode_t vp, struct uio *uiop, int *i
 				np->n_flag &= ~NDSCOMMIT;
 				mtx_unlock(&np->n_mtx);
 			}
-		} else if (rwflag == FREAD)
+		} else if (rwflag == NFSV4OPEN_ACCESSREAD)
 			error = nfsrpc_readds(vp, uiop, stateidp, eofp, *dspp,
 			    io_off, xfer, fhp, cred, p);
 		else {