summarylogtreecommitdiffstats
path: root/kernel-5.15-backport.patch
blob: 40a6bd1babf886b26619c3d424352383a16ea500 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
--- a/ntfs_fs.h
+++ b/ntfs_fs.h
@@ -836,7 +836,7 @@
 
 /* globals from xattr.c */
 #ifdef CONFIG_NTFS3_FS_POSIX_ACL
-struct posix_acl *ntfs_get_acl(struct inode *inode, int type, bool rcu);
+struct posix_acl *ntfs_get_acl(struct inode *inode, int type);
 int ntfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
 		 struct posix_acl *acl, int type);
 int ntfs_init_acl(struct user_namespace *mnt_userns, struct inode *inode,

--- a/xattr.c
+++ b/xattr.c
@@ -532,11 +532,8 @@
 /*
  * ntfs_get_acl - inode_operations::get_acl
  */
-struct posix_acl *ntfs_get_acl(struct inode *inode, int type, bool rcu)
+struct posix_acl *ntfs_get_acl(struct inode *inode, int type)
 {
-	if (rcu)
-		return ERR_PTR(-ECHILD);
-
 	/* TODO: init_user_ns? */
 	return ntfs_get_acl_ex(&init_user_ns, inode, type, 0);
 }
@@ -634,7 +634,7 @@
 		return -EOPNOTSUPP;
 	}
 
-	acl = ntfs_get_acl(inode, type, false);
+	acl = ntfs_get_acl(inode, type);
 	if (IS_ERR(acl))
 		return PTR_ERR(acl);