---

yaml --- r: 148849 b: refs/heads/master c: ef14f0c h: refs/heads/master i: 148847: d4d757c v: v3
git-mirror · Jun 10, 2009 · 2ba4908 · 2ba4908
1 parent 0cb12b7
commit 2ba4908
Show file tree

Hide file tree

Showing 27 changed files with 599 additions and 1,104 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b5403a6d772d340541cfb30a668fde119c40ac1
+refs/heads/master: ef14f0c1578dce4b688726eb2603e50b62d6665a
diff --git a/trunk/fs/xfs/Kconfig b/trunk/fs/xfs/Kconfig
@@ -39,6 +39,7 @@ config XFS_QUOTA
 config XFS_POSIX_ACL
 	bool "XFS POSIX ACL support"
 	depends on XFS_FS
+	select FS_POSIX_ACL
 	help
 	  POSIX Access Control Lists (ACLs) support permissions for users and
 	  groups beyond the owner/group/world scheme.

diff --git a/trunk/fs/xfs/Makefile b/trunk/fs/xfs/Makefile
@@ -40,7 +40,7 @@ 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
+xfs-$(CONFIG_XFS_POSIX_ACL)	+= $(XFS_LINUX)/xfs_acl.o
 xfs-$(CONFIG_PROC_FS)		+= $(XFS_LINUX)/xfs_stats.o
 xfs-$(CONFIG_SYSCTL)		+= $(XFS_LINUX)/xfs_sysctl.o
 xfs-$(CONFIG_COMPAT)		+= $(XFS_LINUX)/xfs_ioctl32.o