From owner-svn-src-head@freebsd.org Fri Nov 20 23:52:29 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8447CA33BDA; Fri, 20 Nov 2015 23:52:29 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 377501AB5; Fri, 20 Nov 2015 23:52:29 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAKNqSKB071541; Fri, 20 Nov 2015 23:52:28 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAKNqSD2071538; Fri, 20 Nov 2015 23:52:28 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201511202352.tAKNqSD2071538@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 20 Nov 2015 23:52:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291116 - in head/sys: kern sys vm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Nov 2015 23:52:29 -0000 Author: glebius Date: Fri Nov 20 23:52:27 2015 New Revision: 291116 URL: https://svnweb.freebsd.org/changeset/base/291116 Log: Remove remnants of the old NFS from vnode pager. Reviewed by: kib Sponsored by: Netflix Modified: head/sys/kern/vfs_subr.c head/sys/sys/mount.h head/sys/vm/vnode_pager.c Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Fri Nov 20 23:15:05 2015 (r291115) +++ head/sys/kern/vfs_subr.c Fri Nov 20 23:52:27 2015 (r291116) @@ -179,12 +179,6 @@ SYSCTL_ULONG(_vfs, OID_AUTO, free_owe_in "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; Modified: head/sys/sys/mount.h ============================================================================== --- head/sys/sys/mount.h Fri Nov 20 23:15:05 2015 (r291115) +++ head/sys/sys/mount.h Fri Nov 20 23:52:27 2015 (r291116) @@ -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; Modified: head/sys/vm/vnode_pager.c ============================================================================== --- head/sys/vm/vnode_pager.c Fri Nov 20 23:15:05 2015 (r291115) +++ head/sys/vm/vnode_pager.c Fri Nov 20 23:52:27 2015 (r291116) @@ -822,12 +822,10 @@ vnode_pager_generic_getpages(struct vnod 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);