aboutsummaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_iops.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2022-05-04 12:36:54 +1000
committerDave Chinner <david@fromorbit.com>2022-05-04 12:36:54 +1000
commit9cf4f6160c20bbdb53f20a773d48ab6dfa3b49e3 (patch)
treea2db0e2211a394d46347b6c6df373c6b453e88da /fs/xfs/xfs_iops.c
parenta44a027a8b2a20fec30e0e9c99b0eb41c03e7420 (diff)
parentbc37e4fb5cac2925b2e286b1f1d4fc2b519f7d92 (diff)
Merge branch 'guilt/xfs-5.19-misc-2' into xfs-5.19-for-next
Diffstat (limited to 'fs/xfs/xfs_iops.c')
-rw-r--r--fs/xfs/xfs_iops.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index b34e8e4344a8..94313b7e9991 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -209,7 +209,6 @@ xfs_generic_create(
if (unlikely(error))
goto out_cleanup_inode;
-#ifdef CONFIG_XFS_POSIX_ACL
if (default_acl) {
error = __xfs_set_acl(inode, default_acl, ACL_TYPE_DEFAULT);
if (error)
@@ -220,7 +219,6 @@ xfs_generic_create(
if (error)
goto out_cleanup_inode;
}
-#endif
xfs_setup_iops(ip);