[XFS] Add XFS_POSIX_ACL to control ACL compilation in xfs

SGI Modid: 2.5.x-xfs:slinx:132045a

fs/Kconfig

@@ -1476,10 +1476,10 @@ config FS_MBCACHE
 	default y if EXT2_FS=y || EXT3_FS=y
 	default m if EXT2_FS=m || EXT3_FS=m
 
-# Posix ACL utility routines (for now, only ext2/ext3/jfs)
+# Posix ACL utility routines (for now, only ext2/ext3/jfs/xfs)
 config FS_POSIX_ACL
 	bool
-	depends on EXT2_FS_POSIX_ACL || EXT3_FS_POSIX_ACL || JFS_POSIX_ACL
+	depends on EXT2_FS_POSIX_ACL || EXT3_FS_POSIX_ACL || JFS_POSIX_ACL || XFS_POSIX_ACL
 	default y
 
 menu "Partition Types"

fs/xfs/Makefile

@@ -59,7 +59,7 @@ xfs-obj-$(CONFIG_XFS_QUOTA)	+= xfs_dquot.o \
 				   xfs_qm_syscalls.o \
 				   xfs_qm.o
 
-xfs-obj-$(CONFIG_FS_POSIX_ACL)	+= xfs_acl.o
+xfs-obj-$(CONFIG_XFS_POSIX_ACL)	+= xfs_acl.o
 xfs-obj-$(CONFIG_FS_POSIX_CAP)	+= xfs_cap.o
 xfs-obj-$(CONFIG_FS_POSIX_MAC)	+= xfs_mac.o
 xfs-obj-$(CONFIG_PROC_FS)	+= linux/xfs_stats.o

fs/xfs/linux/xfs_iops.c

@@ -52,7 +52,7 @@ validate_fields(
 	ip->i_blocks = va.va_nblocks;
 }
 
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_XFS_POSIX_ACL
 /*
  * Determine whether a process has a valid fs_struct (kernel daemons
  * like knfsd don't have an fs_struct).
@@ -81,15 +81,8 @@ linvfs_mknod(
 	if (test_default_acl)
 		have_default_acl = test_default_acl(dvp);
 
-#ifdef CONFIG_FS_POSIX_ACL
-	/*
-	 * Conditionally compiled so that the ACL base kernel changes can be
-	 * split out into separate patches - remove this once MS_POSIXACL is
-	 * accepted, or some other way to implement this exists.
-	 */
 	if (IS_POSIXACL(dir) && !have_default_acl && has_fs_struct(current))
 		mode &= ~current->fs->umask;
-#endif
 
 	memset(&va, 0, sizeof(va));
 	va.va_mask = AT_TYPE|AT_MODE;

fs/xfs/linux/xfs_super.c

@@ -56,7 +56,7 @@ extern void xfs_cleanup(void);
 # define set_max_bytes(sb)	do { } while (0)
 #endif
 
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_XFS_POSIX_ACL
 # define set_posix_acl(sb)	((sb)->s_flags |= MS_POSIXACL)
 #else
 # define set_posix_acl(sb)	do { } while (0)

fs/xfs/linux/xfs_super.h

@@ -32,7 +32,7 @@
 #ifndef __XFS_SUPER_H__
 #define __XFS_SUPER_H__
 
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_XFS_POSIX_ACL
 # define XFS_ACL_STRING		"ACLs, "
 #else
 # define XFS_ACL_STRING

fs/xfs/xfs_acl.h

@@ -63,7 +63,7 @@ typedef struct xfs_acl {
 
 #ifdef __KERNEL__
 
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_XFS_POSIX_ACL
 
 struct vattr;
 struct vnode;