svn commit: r309279 - stable/11/sys/fs/nfsclient

[Konstantin Belousov]

Author: kib
Date: Tue Nov 29 08:17:24 2016
New Revision: 309279
URL: https://svnweb.freebsd.org/changeset/base/309279

Log:
  MFC r308973:
  Minor cleanup.

Modified:
  stable/11/sys/fs/nfsclient/nfs_clbio.c
  stable/11/sys/fs/nfsclient/nfs_clvnops.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/fs/nfsclient/nfs_clbio.c
==============================================================================
--- stable/11/sys/fs/nfsclient/nfs_clbio.c	Tue Nov 29 08:15:12 2016	(r309278)
+++ stable/11/sys/fs/nfsclient/nfs_clbio.c	Tue Nov 29 08:17:24 2016	(r309279)
@@ -96,8 +96,8 @@ ncl_getpages(struct vop_getpages_args *a
 
 	vp = ap->a_vp;
 	np = VTONFS(vp);
-	td = curthread;				/* XXX */
-	cred = curthread->td_ucred;		/* XXX */
+	td = curthread;
+	cred = curthread->td_ucred;
 	nmp = VFSTONFS(vp->v_mount);
 	pages = ap->a_m;
 	npages = ap->a_count;

Modified: stable/11/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- stable/11/sys/fs/nfsclient/nfs_clvnops.c	Tue Nov 29 08:15:12 2016	(r309278)
+++ stable/11/sys/fs/nfsclient/nfs_clvnops.c	Tue Nov 29 08:17:24 2016	(r309279)
@@ -105,15 +105,6 @@ extern int nfsrv_useacl;
 extern int nfscl_debuglevel;
 MALLOC_DECLARE(M_NEWNFSREQ);
 
-/*
- * Ifdef for FreeBSD-current merged buffer cache. It is unfortunate that these
- * calls are not in getblk() and brelse() so that they would not be necessary
- * here.
- */
-#ifndef B_VMIO
-#define	vfs_busy_pages(bp, f)
-#endif
-
 static vop_read_t	nfsfifo_read;
 static vop_write_t	nfsfifo_write;
 static vop_close_t	nfsfifo_close;