From: Felix Blyakher Date: Thu, 11 Jun 2009 21:56:49 +0000 (-0500) Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=35fd035968de4f674b9d62ee7b1d80ab7a50c384;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'master' of git://git./fs/xfs/xfs --- 35fd035968de4f674b9d62ee7b1d80ab7a50c384 diff --cc fs/xfs/linux-2.6/xfs_iops.c index 6075382336d7,84e391ab70b0..800dd4f98d4e --- a/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);