From owner-svn-src-all@FreeBSD.ORG  Sat Jun 18 21:10:03 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B3FF91065670;
	Sat, 18 Jun 2011 21:10:03 +0000 (UTC)
	(envelope-from mckusick@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E9348FC16;
	Sat, 18 Jun 2011 21:10:03 +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 p5ILA3VO057206;
	Sat, 18 Jun 2011 21:10:03 GMT
	(envelope-from mckusick@svn.freebsd.org)
Received: (from mckusick@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5ILA3cL057205;
	Sat, 18 Jun 2011 21:10:03 GMT
	(envelope-from mckusick@svn.freebsd.org)
Message-Id: <201106182110.p5ILA3cL057205@svn.freebsd.org>
From: Kirk McKusick <mckusick@FreeBSD.org>
Date: Sat, 18 Jun 2011 21:10:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223268 - head/sys/ufs/ffs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Jun 2011 21:10:03 -0000

Author: mckusick
Date: Sat Jun 18 21:10:03 2011
New Revision: 223268
URL: http://svn.freebsd.org/changeset/base/223268

Log:
  Fixed dereference of a NULL pointer.
  
  Reported by:	Peter Holm

Modified:
  head/sys/ufs/ffs/ffs_snapshot.c

Modified: head/sys/ufs/ffs/ffs_snapshot.c
==============================================================================
--- head/sys/ufs/ffs/ffs_snapshot.c	Sat Jun 18 21:08:27 2011	(r223267)
+++ head/sys/ufs/ffs/ffs_snapshot.c	Sat Jun 18 21:10:03 2011	(r223268)
@@ -1918,7 +1918,8 @@ retry:
 	if (savedcbp) {
 		vp = savedcbp->b_vp;
 		bawrite(savedcbp);
-		if ((vtype == VDIR || dopersistence) && ip->i_effnlink > 0)
+		if ((vtype == VDIR || dopersistence) &&
+		    VTOI(vp)->i_effnlink > 0)
 			(void) ffs_syncvnode(vp, MNT_WAIT);
 	}
 	/*