summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrdivacky <rdivacky@FreeBSD.org>2009-09-22 16:22:05 +0000
committerrdivacky <rdivacky@FreeBSD.org>2009-09-22 16:22:05 +0000
commitf3b70d313ab348c74bf01a805b66dcbfc8a54965 (patch)
tree4f9f00fcbca32160780134fb5aa2300b5c8ee7dc
parent69bdbc1b60333eb3c6bea4c5a6d53a4a6d38ab61 (diff)
downloadFreeBSD-src-f3b70d313ab348c74bf01a805b66dcbfc8a54965.zip
FreeBSD-src-f3b70d313ab348c74bf01a805b66dcbfc8a54965.tar.gz
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)
-rw-r--r--sys/conf/files2
-rw-r--r--sys/ufs/ufs/ufs_gjournal.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 6e68267..a7275ad 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -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
diff --git a/sys/ufs/ufs/ufs_gjournal.c b/sys/ufs/ufs/ufs_gjournal.c
index da0de65..8e35c08 100644
--- a/sys/ufs/ufs/ufs_gjournal.c
+++ b/sys/ufs/ufs/ufs_gjournal.c
@@ -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 */
OpenPOWER on IntegriCloud