Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs

diff --cc fs/xfs/linux-2.6/xfs_ioctl.c
Simple merge

diff --cc fs/xfs/linux-2.6/xfs_iops.c
index 6075382336d70b0feca5d7e84b1a53b9926987fd,84e391ab70b07fdfcbebdf2414c061880ccb4af5..800dd4f98d4edd652f8352c7b1b34eb6bbd26d35
--- 1/fs/xfs/linux-2.6/xfs_iops.c
--- 2/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/linux-2.6/xfs_iops.c
@@@ -219,18 -220,14 +220,14 @@@ xfs_vn_mknod
                rdev = 0;
        }
  
-       if (test_default_acl && test_default_acl(dir)) {
-               if (!_ACL_ALLOC(default_acl)) {
-                       return -ENOMEM;
-               }
-               if (!_ACL_GET_DEFAULT(dir, default_acl)) {
-                       _ACL_FREE(default_acl);
-                       default_acl = NULL;
-               }
-       }
+       if (IS_POSIXACL(dir)) {
+               default_acl = xfs_get_acl(dir, ACL_TYPE_DEFAULT);
+               if (IS_ERR(default_acl))
+                       return -PTR_ERR(default_acl);
  
-       if (IS_POSIXACL(dir) && !default_acl)
 -              if (!default_acl)
 -                      mode &= ~current->fs->umask;
++      if (!default_acl)
 +              mode &= ~current_umask();
+       }
  
        xfs_dentry_to_name(&name, dentry);
        error = xfs_create(XFS_I(dir), &name, mode, rdev, &ip, NULL);