diff options
| author | kib <kib@FreeBSD.org> | 2016-11-29 08:17:24 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-11-29 08:17:24 +0000 |
| commit | fc5be6d0299c1ec11afb2bc30478b614ab25f964 (patch) | |
| tree | aa21853f122c528bdc81e17411dacbeb56495a04 /sys | |
| parent | 9e49301e62d444d93c70ed48cee7e6e2209288e1 (diff) | |
| download | FreeBSD-src-fc5be6d0299c1ec11afb2bc30478b614ab25f964.zip FreeBSD-src-fc5be6d0299c1ec11afb2bc30478b614ab25f964.tar.gz | |
MFC r308973:
Minor cleanup.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/fs/nfsclient/nfs_clbio.c | 4 | ||||
| -rw-r--r-- | sys/fs/nfsclient/nfs_clvnops.c | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/sys/fs/nfsclient/nfs_clbio.c b/sys/fs/nfsclient/nfs_clbio.c index 492a072..45a48cf 100644 --- a/sys/fs/nfsclient/nfs_clbio.c +++ b/sys/fs/nfsclient/nfs_clbio.c @@ -96,8 +96,8 @@ ncl_getpages(struct vop_getpages_args *ap) 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; diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 69c1fe7..00adee1 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -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; |
