svn commit: r197408 - in head/sys: conf ufs/ufs

[Roman Divacky]

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 */