--- kernel/bsd/nfs/nfs_subs.c	2018/04/24 18:26:01	1.1
+++ kernel/bsd/nfs/nfs_subs.c	2018/04/24 18:27:55	1.1.1.2
@@ -590,6 +590,10 @@ LIST_HEAD(nfsnodehashhead, nfsnode);
 
 int nfs_webnamei __P((struct nameidata *, struct vnode *, struct proc *));
 
+#if DIAGNOSTIC
+int nfsattrcheck;
+#endif
+
 /*
  * Create the header for an rpc request packet
  * The hsiz is the size of the rest of the nfs request header.
@@ -1415,17 +1419,13 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper
 		} else if (vmp->lock.want_write || vmp->lock.want_upgrade ||
 			   vmp->lock.read_count) {
 			vmp->invalidate = TRUE; /* vmp_put will do it */
-#if DIAGNOSTIC
-                        kprintf("nfs_loadattrcache: invalidate vp %x\n",
-                        	(unsigned)vp);
-#endif /* DIAGNOSTIC */
+			NFS_DPF(ATTR, ("nfs_loadattrcache: invalidate vp %x\n",
+				       (unsigned)vp));
 		} else { /* clear the way for server's dirt */
 			mapfs_memfree(vmp, TRUE);
 			vmp->vnode_size = vap->va_size;
-#if DIAGNOSTIC
-                        kprintf("nfs_loadattrcache: memfree vp %x\n",
-                        	(unsigned)vp);
-#endif /* DIAGNOSTIC */
+			NFS_DPF(ATTR, ("nfs_loadattrcache: memfree vp %x\n",
+				       (unsigned)vp));
 		}
 	}
 #endif	/* MACH_NBC */
@@ -1503,17 +1503,13 @@ nfs_getattrcache(vp, vaper)
 		} else if (vmp->lock.want_write || vmp->lock.want_upgrade ||
 			   vmp->lock.read_count) {
 			vmp->invalidate = TRUE; /* vmp_put will do it */
-#if DIAGNOSTIC
-                        kprintf("nfs_getattrcache: invalidate vp %x\n",
-                        	(unsigned)vp);
-#endif /* DIAGNOSTIC */
+			NFS_DPF(ATTR, ("nfs_getattrcache: invalidate vp %x\n",
+                        	       (unsigned)vp));
 		} else { /* clear the way for server's dirt */
 			mapfs_memfree(vmp, TRUE);
 			vmp->vnode_size = vap->va_size;
-#if DIAGNOSTIC
-                        kprintf("nfs_getattrcache: memfree vp %x\n",
-                        	(unsigned)vp);
-#endif /* DIAGNOSTIC */
+			NFS_DPF(ATTR, ("nfs_getattrcache: memfree vp %x\n",
+                        	       (unsigned)vp));
 		}
 	}
 #endif	/* MACH_NBC */