From owner-svn-src-head@freebsd.org  Thu Oct  1 16:34:54 2015
Return-Path: <owner-svn-src-head@freebsd.org>
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 854E1A0D904;
 Thu,  1 Oct 2015 16:34:54 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 57EE81793;
 Thu,  1 Oct 2015 16:34:54 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t91GYsAJ085137;
 Thu, 1 Oct 2015 16:34:54 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t91GYsml085136;
 Thu, 1 Oct 2015 16:34:54 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201510011634.t91GYsml085136@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Thu, 1 Oct 2015 16:34:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r288451 - head/sys/kern
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
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Oct 2015 16:34:54 -0000

Author: markj
Date: Thu Oct  1 16:34:53 2015
New Revision: 288451
URL: https://svnweb.freebsd.org/changeset/base/288451

Log:
  Ensure that vop_stdadvise() does not call getblk() on vnodes that have an
  empty bufobj. Otherwise, vnodes belonging to filesystems that do not use the
  buffer cache may trigger assertion failures.
  
  Reported by:	Fabien Keil

Modified:
  head/sys/kern/vfs_default.c

Modified: head/sys/kern/vfs_default.c
==============================================================================
--- head/sys/kern/vfs_default.c	Thu Oct  1 16:30:20 2015	(r288450)
+++ head/sys/kern/vfs_default.c	Thu Oct  1 16:34:53 2015	(r288451)
@@ -1077,16 +1077,15 @@ vop_stdadvise(struct vop_advise_args *ap
 		BO_RLOCK(&vp->v_bufobj);
 		bsize = vp->v_bufobj.bo_bsize;
 		startn = ap->a_start / bsize;
-		if (ap->a_end == OFF_MAX) {
-			endn = -1;
-			bl = &vp->v_bufobj.bo_clean.bv_hd;
-			if (!TAILQ_EMPTY(bl))
-				endn = TAILQ_LAST(bl, buflists)->b_lblkno;
-			bl = &vp->v_bufobj.bo_dirty.bv_hd;
-			if (!TAILQ_EMPTY(bl) &&
-			    endn < TAILQ_LAST(bl, buflists)->b_lblkno)
-				endn = TAILQ_LAST(bl, buflists)->b_lblkno;
-		} else
+		endn = -1;
+		bl = &vp->v_bufobj.bo_clean.bv_hd;
+		if (!TAILQ_EMPTY(bl))
+			endn = TAILQ_LAST(bl, buflists)->b_lblkno;
+		bl = &vp->v_bufobj.bo_dirty.bv_hd;
+		if (!TAILQ_EMPTY(bl) &&
+		    endn < TAILQ_LAST(bl, buflists)->b_lblkno)
+			endn = TAILQ_LAST(bl, buflists)->b_lblkno;
+		if (ap->a_end != OFF_MAX && endn != -1)
 			endn = ap->a_end / bsize;
 		BO_RUNLOCK(&vp->v_bufobj);
 		/*