From owner-svn-src-projects@FreeBSD.ORG Sun Jul 22 15:07:36 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8096D106566B; Sun, 22 Jul 2012 15:07:36 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6C54B8FC12; Sun, 22 Jul 2012 15:07:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6MF7a82097615; Sun, 22 Jul 2012 15:07:36 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6MF7aIO097613; Sun, 22 Jul 2012 15:07:36 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201207221507.q6MF7aIO097613@svn.freebsd.org> From: Attilio Rao Date: Sun, 22 Jul 2012 15:07:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r238695 - projects/fuse/sys/fs/fuse X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jul 2012 15:07:36 -0000 Author: attilio Date: Sun Jul 22 15:07:35 2012 New Revision: 238695 URL: http://svn.freebsd.org/changeset/base/238695 Log: Remove bogus __FreeBSD_version opt-in, caming probabily from the port era. Modified: projects/fuse/sys/fs/fuse/fuse_vnops.c Modified: projects/fuse/sys/fs/fuse/fuse_vnops.c ============================================================================== --- projects/fuse/sys/fs/fuse/fuse_vnops.c Sun Jul 22 14:47:15 2012 (r238694) +++ projects/fuse/sys/fs/fuse/fuse_vnops.c Sun Jul 22 15:07:35 2012 (r238695) @@ -185,17 +185,10 @@ SYSCTL_INT(_vfs_fuse, OID_AUTO, reclaim_ int fuse_pbuf_freecnt = -1; -#if __FreeBSD_version >= 900011 #define fuse_vm_page_lock(m) vm_page_lock((m)); #define fuse_vm_page_unlock(m) vm_page_unlock((m)); #define fuse_vm_page_lock_queues() ((void)0) #define fuse_vm_page_unlock_queues() ((void)0) -#else -#define fuse_vm_page_lock(m) ((void)0) -#define fuse_vm_page_unlock(m) ((void)0) -#define fuse_vm_page_lock_queues() vm_page_lock_queues() -#define fuse_vm_page_unlock_queues() vm_page_unlock_queues() -#endif /* struct vnop_access_args { @@ -1928,11 +1921,7 @@ fuse_vnop_getpages(struct vop_getpages_a * Read operation filled a partial page. */ m->valid = 0; -#if __FreeBSD_version >= 1000002 vm_page_set_valid_range(m, 0, size - toff); -#else - vm_page_set_valid(m, 0, size - toff); -#endif KASSERT(m->dirty == 0, ("fuse_getpages: page %p is dirty", m)); } else {