Merge tag 'mm-stable-2023-04-27-15-30' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index 1a6263f54adaf7c87dad8d1614b75a68ce00eaf2..e40a08c5c6d78ac629b52e4956b4cb5c13948b6c 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -3351,10 +3351,6 @@ static const struct xattr_handler shmem_trusted_xattr_handler = {
 };
 
 static const struct xattr_handler *shmem_xattr_handlers[] = {
-#ifdef CONFIG_TMPFS_POSIX_ACL
-       &posix_acl_access_xattr_handler,
-       &posix_acl_default_xattr_handler,
-#endif
        &shmem_security_xattr_handler,
        &shmem_trusted_xattr_handler,
        NULL