From owner-svn-src-all@FreeBSD.ORG  Mon Feb  6 17:59:15 2012
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 7B6D0106566B;
	Mon,  6 Feb 2012 17:59:15 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6A6B88FC0A;
	Mon,  6 Feb 2012 17:59:15 +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 q16HxF6d047086;
	Mon, 6 Feb 2012 17:59:15 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q16HxFKk047084;
	Mon, 6 Feb 2012 17:59:15 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201202061759.q16HxFKk047084@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Mon, 6 Feb 2012 17:59:15 +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: r231091 - 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: Mon, 06 Feb 2012 17:59:15 -0000

Author: kib
Date: Mon Feb  6 17:59:14 2012
New Revision: 231091
URL: http://svn.freebsd.org/changeset/base/231091

Log:
  Add missing opt_quota.h include to activate #ifdef QUOTA blocks,
  apparently a step in unbreaking QUOTA support.
  
  Reported and tested by:	Adam Strohl <adams-freebsd ateamsystems com>
  MFC after:	1 week

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

Modified: head/sys/ufs/ffs/ffs_softdep.c
==============================================================================
--- head/sys/ufs/ffs/ffs_softdep.c	Mon Feb  6 17:31:13 2012	(r231090)
+++ head/sys/ufs/ffs/ffs_softdep.c	Mon Feb  6 17:59:14 2012	(r231091)
@@ -43,6 +43,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ffs.h"
+#include "opt_quota.h"
 #include "opt_ddb.h"
 
 /*
@@ -6428,7 +6429,7 @@ softdep_setup_freeblocks(ip, length, fla
 	}
 #ifdef QUOTA
 	/* Reference the quotas in case the block count is wrong in the end. */
-	quotaref(vp, freeblks->fb_quota);
+	quotaref(ITOV(ip), freeblks->fb_quota);
 	(void) chkdq(ip, -datablocks, NOCRED, 0);
 #endif
 	freeblks->fb_chkcnt = -datablocks;