From owner-svn-src-user@FreeBSD.ORG  Tue Feb  5 00:20:00 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A8F83CD8;
 Tue,  5 Feb 2013 00:20:00 +0000 (UTC)
 (envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9AA13A8D;
 Tue,  5 Feb 2013 00:20:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r150K0A6047429;
 Tue, 5 Feb 2013 00:20:00 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r150K01K047428;
 Tue, 5 Feb 2013 00:20:00 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201302050020.r150K01K047428@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Tue, 5 Feb 2013 00:20:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r246339 -
 user/attilio/vmc-playground/sys/cddl/compat/opensolaris/sys
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Feb 2013 00:20:00 -0000

Author: attilio
Date: Tue Feb  5 00:20:00 2013
New Revision: 246339
URL: http://svnweb.freebsd.org/changeset/base/246339

Log:
  Restrengten vn_has_cached_data() by also checking the resident pages
  count, just like HEAD does.

Modified:
  user/attilio/vmc-playground/sys/cddl/compat/opensolaris/sys/vnode.h

Modified: user/attilio/vmc-playground/sys/cddl/compat/opensolaris/sys/vnode.h
==============================================================================
--- user/attilio/vmc-playground/sys/cddl/compat/opensolaris/sys/vnode.h	Tue Feb  5 00:09:33 2013	(r246338)
+++ user/attilio/vmc-playground/sys/cddl/compat/opensolaris/sys/vnode.h	Tue Feb  5 00:20:00 2013	(r246339)
@@ -75,7 +75,8 @@ vn_is_readonly(vnode_t *vp)
 #define	vn_mountedvfs(vp)	((vp)->v_mountedhere)
 #define	vn_has_cached_data(vp)	\
 	((vp)->v_object != NULL && \
-	 !vm_object_cache_is_empty((vp)->v_object))
+	 ((vp)->v_object->resident_page_count > 0 || \
+	  !vm_object_cache_is_empty((vp)->v_object))
 #define	vn_exists(vp)		do { } while (0)
 #define	vn_invalid(vp)		do { } while (0)
 #define	vn_renamepath(tdvp, svp, tnm, lentnm)	do { } while (0)