diff options
Diffstat (limited to 'kernel-5.14-backport.patch')
| -rw-r--r-- | kernel-5.14-backport.patch | 39 |
1 files changed, 38 insertions, 1 deletions
diff --git a/kernel-5.14-backport.patch b/kernel-5.14-backport.patch index e8d60eb8b92d..c357004e0680 100644 --- a/kernel-5.14-backport.patch +++ b/kernel-5.14-backport.patch @@ -1,6 +1,6 @@ --- a/file.c +++ b/file.c -@@ -910,10 +910,10 @@ +@@ -1026,10 +1026,10 @@ size_t cp, tail = PAGE_SIZE - off; page = pages[ip]; @@ -14,3 +14,40 @@ copied += cp; bytes -= cp; if (!bytes || !cp) + +--- a/ntfs_fs.h ++++ b/ntfs_fs.h +@@ -809,7 +809,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 +@@ -535,11 +535,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); + } +@@ -638,7 +635,7 @@ + return -EOPNOTSUPP; + } + +- acl = ntfs_get_acl(inode, type, false); ++ acl = ntfs_get_acl(inode, type); + if (IS_ERR(acl)) + return PTR_ERR(acl); + |