svn commit: r260143 - in stable/10/sys/fs: nfs nfsclient

[Rick Macklem]

Author: rmacklem
Date: Tue Dec 31 21:56:02 2013
New Revision: 260143
URL: http://svnweb.freebsd.org/changeset/base/260143

Log:
  MFC: r259801
  The NFSv4 client was passing both the p and cred arguments to
  nfsv4_fillattr() as NULLs for the Getattr callback. This caused
  nfsv4_fillattr() to not fill in the Change attribute for the reply.
  I believe this was a violation of the RFC, but had little effect on
  server behaviour. This patch passes a non-NULL p argument to fix this.

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

Modified: stable/10/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- stable/10/sys/fs/nfs/nfs_commonsubs.c	Tue Dec 31 21:37:24 2013	(r260142)
+++ stable/10/sys/fs/nfs/nfs_commonsubs.c	Tue Dec 31 21:56:02 2013	(r260143)
@@ -2011,7 +2011,12 @@ nfsv4_fillattr(struct nfsrv_descript *nd
 	 * First, set the bits that can be filled and get fsinfo.
 	 */
 	NFSSET_ATTRBIT(retbitp, attrbitp);
-	/* If p and cred are NULL, it is a client side call */
+	/*
+	 * If both p and cred are NULL, it is a client side setattr call.
+	 * If both p and cred are not NULL, it is a server side reply call.
+	 * If p is not NULL and cred is NULL, it is a client side callback
+	 * reply call.
+	 */
 	if (p == NULL && cred == NULL) {
 		NFSCLRNOTSETABLE_ATTRBIT(retbitp);
 		aclp = saclp;

Modified: stable/10/sys/fs/nfsclient/nfs_clstate.c
==============================================================================
--- stable/10/sys/fs/nfsclient/nfs_clstate.c	Tue Dec 31 21:37:24 2013	(r260142)
+++ stable/10/sys/fs/nfsclient/nfs_clstate.c	Tue Dec 31 21:56:02 2013	(r260143)
@@ -3279,7 +3279,7 @@ nfscl_docb(struct nfsrv_descript *nd, NF
 				FREE((caddr_t)nfhp, M_NFSFH);
 			if (!error)
 				(void) nfsv4_fillattr(nd, NULL, NULL, NULL, &va,
-				    NULL, 0, &rattrbits, NULL, NULL, 0, 0, 0, 0,
+				    NULL, 0, &rattrbits, NULL, p, 0, 0, 0, 0,
 				    (uint64_t)0);
 			break;
 		case NFSV4OP_CBRECALL: