aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2007-11-28 18:28:09 +1100
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2008-02-18 13:06:17 +1100
commit269cdfaf769f5cd831284cc831790c7c5038040f (patch)
treed7e4ff963d0bf73f5ba61500f1bae0fcfca9d9d6
parent794f744b225aaf35742aac9e7b9dda96a9943413 (diff)
[XFS] Added quota targets and removed dmapi directory
Fixes build failures introduced by bad merge to mainline.
-rw-r--r--fs/xfs/Makefile31
1 files changed, 13 insertions, 18 deletions
diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile
index 57c923212d7..36ec614e699 100644
--- a/fs/xfs/Makefile
+++ b/fs/xfs/Makefile
@@ -25,8 +25,18 @@ ifeq ($(CONFIG_XFS_DEBUG),y)
endif
obj-$(CONFIG_XFS_FS) += xfs.o
-obj-$(CONFIG_XFS_QUOTA) += quota/
-obj-$(CONFIG_XFS_DMAPI) += dmapi/
+
+xfs-$(CONFIG_XFS_QUOTA) += $(addprefix quota/, \
+ xfs_dquot.o \
+ xfs_dquot_item.o \
+ xfs_trans_dquot.o \
+ xfs_qm_syscalls.o \
+ xfs_qm_bhv.o \
+ xfs_qm.o)
+
+ifeq ($(CONFIG_XFS_QUOTA),y)
+xfs-$(CONFIG_PROC_FS) += quota/xfs_qm_stats.o
+endif
xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o
xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o
@@ -96,8 +106,7 @@ xfs-y += $(addprefix $(XFS_LINUX)/, \
xfs_iops.o \
xfs_lrw.o \
xfs_super.o \
- xfs_vnode.o \
- xfs_ksyms.o)
+ xfs_vnode.o)
# Objects in support/
xfs-y += $(addprefix support/, \
@@ -106,17 +115,3 @@ xfs-y += $(addprefix support/, \
xfs-$(CONFIG_XFS_TRACE) += support/ktrace.o
-# If both xfs and kdb modules are built in then xfsidbg is built in. If xfs is
-# a module and kdb modules are being compiled then xfsidbg must be a module, to
-# follow xfs. If xfs is built in then xfsidbg tracks the kdb module state.
-# This must come after the main xfs code so xfs initialises before xfsidbg.
-# KAO
-ifneq ($(CONFIG_KDB_MODULES),)
- ifeq ($(CONFIG_XFS_FS),y)
- obj-$(CONFIG_KDB_MODULES) += xfsidbg.o
- else
- obj-$(CONFIG_XFS_FS) += xfsidbg.o
- endif
-endif
-
-CFLAGS_xfsidbg.o += -Iarch/$(ARCH)/kdb