[XFS] Revert recent quota Makefile change, not in a fit state for merging.

This change “[XFS] Revert recent quota Makefile change, not in a fit state for merging.” (commit c9fc0d6) in Linux kernel is authored by Nathan Scott <nathans [at] bruce> on Fri Sep 9 11:38:09 2005 +1000.

Description of "[XFS] Revert recent quota Makefile change, not in a fit state for merging."

The change “[XFS] Revert recent quota Makefile change, not in a fit state for merging.” introduces changes as follows.

[XFS] Revert recent quota Makefile change, not in a fit state for merging.

Signed-off-by: Nathan Scott <nathans@sgi.com>

Linux kernel releases containing commit c9fc0d6

The Linux kernel releases containing this commit are as follows.

Linux kernel code changes from "[XFS] Revert recent quota Makefile change, not in a fit state for merging."

There are 15 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 fs/xfs/Makefile-linux-2.6 | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
 
diff --git a/fs/xfs/Makefile-linux-2.6 b/fs/xfs/Makefile-linux-2.6
index 8e18ff157247..d8c87fa21ad1 100644
--- a/fs/xfs/Makefile-linux-2.6
+++ b/fs/xfs/Makefile-linux-2.6
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000-2004 Silicon Graphics, Inc.  All Rights Reserved.
+# Copyright (c) 2000-2005 Silicon Graphics, Inc.  All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of version 2 of the GNU General Public License as
@@ -55,7 +55,18 @@ ifeq ($(CONFIG_XFS_TRACE),y)
 endif
 
 obj-$(CONFIG_XFS_FS)		+= xfs.o
-xfs-$(CONFIG_XFS_QUOTA)		+= quota/
+
+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

The commit for this change in Linux stable tree is c9fc0d6 (patch).

Last modified: 2020/02/11