From owner-svn-src-all@FreeBSD.ORG  Tue Sep 22 16:22:05 2009
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 AA56A106566B;
	Tue, 22 Sep 2009 16:22:05 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 999748FC17;
	Tue, 22 Sep 2009 16:22:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8MGM5f5025139;
	Tue, 22 Sep 2009 16:22:05 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Received: (from rdivacky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8MGM5WK025136;
	Tue, 22 Sep 2009 16:22:05 GMT
	(envelope-from rdivacky@svn.freebsd.org)
Message-Id: <200909221622.n8MGM5WK025136@svn.freebsd.org>
From: Roman Divacky <rdivacky@FreeBSD.org>
Date: Tue, 22 Sep 2009 16:22:05 +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: r197408 - in head/sys: conf ufs/ufs
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: Tue, 22 Sep 2009 16:22:05 -0000

Author: rdivacky
Date: Tue Sep 22 16:22:05 2009
New Revision: 197408
URL: http://svn.freebsd.org/changeset/base/197408

Log:
  Don't build ufs_gjournal.c at all if UFS_GJOURNAL option is not given
  instead of building an almost empty C file.
  
  Approved by:	pjd
  Approved by:	ed (mentor, implicit)

Modified:
  head/sys/conf/files
  head/sys/ufs/ufs/ufs_gjournal.c

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Tue Sep 22 16:16:02 2009	(r197407)
+++ head/sys/conf/files	Tue Sep 22 16:22:05 2009	(r197408)
@@ -2634,7 +2634,7 @@ ufs/ufs/ufs_acl.c		optional ffs
 ufs/ufs/ufs_bmap.c		optional ffs
 ufs/ufs/ufs_dirhash.c		optional ffs
 ufs/ufs/ufs_extattr.c		optional ffs
-ufs/ufs/ufs_gjournal.c		optional ffs
+ufs/ufs/ufs_gjournal.c		optional ffs UFS_GJOURNAL
 ufs/ufs/ufs_inode.c		optional ffs
 ufs/ufs/ufs_lookup.c		optional ffs
 ufs/ufs/ufs_quota.c		optional ffs

Modified: head/sys/ufs/ufs/ufs_gjournal.c
==============================================================================
--- head/sys/ufs/ufs/ufs_gjournal.c	Tue Sep 22 16:16:02 2009	(r197407)
+++ head/sys/ufs/ufs/ufs_gjournal.c	Tue Sep 22 16:22:05 2009	(r197408)
@@ -29,8 +29,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_ufs.h"
 
-#ifdef UFS_GJOURNAL
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -137,5 +135,3 @@ ufs_gjournal_close(struct vnode *vp)
 		return;
 	ufs_gjournal_modref(vp, -1);
 }
-
-#endif /* UFS_GJOURNAL */