diff options
author | glebius <glebius@FreeBSD.org> | 2015-11-20 23:52:27 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2015-11-20 23:52:27 +0000 |
commit | 6460e3db4e6d4865cbc26bceee8a5e18a88e6adc (patch) | |
tree | c46dddf983b8244c5763622d17b760aa6c510841 /sys | |
parent | 3a63b2a80a42ea40a57a1484d6f37bb3feffebef (diff) | |
download | FreeBSD-src-6460e3db4e6d4865cbc26bceee8a5e18a88e6adc.zip FreeBSD-src-6460e3db4e6d4865cbc26bceee8a5e18a88e6adc.tar.gz |
Remove remnants of the old NFS from vnode pager.
Reviewed by: kib
Sponsored by: Netflix
Diffstat (limited to 'sys')
-rw-r--r-- | sys/kern/vfs_subr.c | 6 | ||||
-rw-r--r-- | sys/sys/mount.h | 1 | ||||
-rw-r--r-- | sys/vm/vnode_pager.c | 8 |
3 files changed, 3 insertions, 12 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 6976c3b..c2f6c50 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -179,12 +179,6 @@ SYSCTL_ULONG(_vfs, OID_AUTO, free_owe_inact, CTLFLAG_RD, &free_owe_inact, 0, "Number of times free vnodes kept on active list due to VFS " "owing inactivation"); -/* - * Cache for the mount type id assigned to NFS. This is used for - * special checks in nfs/nfs_nqlease.c and vm/vnode_pager.c. - */ -int nfs_mount_type = -1; - /* To keep more than one thread at a time from running vfs_getnewfsid */ static struct mtx mntid_mtx; diff --git a/sys/sys/mount.h b/sys/sys/mount.h index e4eb43d..f11f8f5 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -590,7 +590,6 @@ struct uio; MALLOC_DECLARE(M_MOUNT); #endif extern int maxvfsconf; /* highest defined filesystem type */ -extern int nfs_mount_type; /* vfc_typenum for nfs, or -1 */ TAILQ_HEAD(vfsconfhead, vfsconf); extern struct vfsconfhead vfsconf; diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 7cddbd8..c3eebc3 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -822,12 +822,10 @@ vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m, int bytecount, return (VM_PAGER_ERROR); /* - * if the blocksize is smaller than a page size, then use - * special small filesystem code. NFS sometimes has a small - * blocksize, but it can handle large reads itself. + * If the blocksize is smaller than a page size, then use + * special small filesystem code. */ - } else if ((PAGE_SIZE / bsize) > 1 && - (vp->v_mount->mnt_stat.f_type != nfs_mount_type)) { + } else if ((PAGE_SIZE / bsize) > 1) { relpbuf(bp, freecnt); vm_pager_free_nonreq(object, m, reqpage, count, FALSE); PCPU_INC(cnt.v_vnodein); |