From: Sasha Levin Date: Thu, 9 Jun 2022 14:27:17 +0000 (-0400) Subject: Drop fs-ntfs3-restore-ntfs_xattr_get_acl-and-ntfs_xattr_s.patch X-Git-Tag: v4.9.318~111 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88aadc81363220ac7eea3327caa968295caa7b14;p=thirdparty%2Fkernel%2Fstable-queue.git Drop fs-ntfs3-restore-ntfs_xattr_get_acl-and-ntfs_xattr_s.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.15/fs-ntfs3-restore-ntfs_xattr_get_acl-and-ntfs_xattr_s.patch b/queue-5.15/fs-ntfs3-restore-ntfs_xattr_get_acl-and-ntfs_xattr_s.patch deleted file mode 100644 index 332253858da..00000000000 --- a/queue-5.15/fs-ntfs3-restore-ntfs_xattr_get_acl-and-ntfs_xattr_s.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 335f7fef8e55984a2ac677d5a9fb8eb45387f768 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 22 Oct 2021 18:15:36 +0300 -Subject: fs/ntfs3: Restore ntfs_xattr_get_acl and ntfs_xattr_set_acl functions - -From: Konstantin Komarov - -[ Upstream commit 87e21c99bad763524c953ff4d1a61ee19038ddc2 ] - -Apparently we need to maintain these functions with -ntfs_get_acl_ex and ntfs_set_acl_ex. -This commit fixes xfstest generic/099 -Fixes: 95dd8b2c1ed0 ("fs/ntfs3: Remove unnecessary functions") - -Reviewed-by: Kari Argillander -Signed-off-by: Konstantin Komarov -Signed-off-by: Sasha Levin ---- - fs/ntfs3/xattr.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 61 insertions(+) - -diff --git a/fs/ntfs3/xattr.c b/fs/ntfs3/xattr.c -index 0968565ff2ca..52ef3a60cde4 100644 ---- a/fs/ntfs3/xattr.c -+++ b/fs/ntfs3/xattr.c -@@ -681,6 +681,67 @@ static int ntfs_xattr_set_acl(struct user_namespace *mnt_userns, - return err; - } - -+static int ntfs_xattr_get_acl(struct user_namespace *mnt_userns, -+ struct inode *inode, int type, void *buffer, -+ size_t size) -+{ -+ struct posix_acl *acl; -+ int err; -+ -+ if (!(inode->i_sb->s_flags & SB_POSIXACL)) { -+ ntfs_inode_warn(inode, "add mount option \"acl\" to use acl"); -+ return -EOPNOTSUPP; -+ } -+ -+ acl = ntfs_get_acl(inode, type, false); -+ if (IS_ERR(acl)) -+ return PTR_ERR(acl); -+ -+ if (!acl) -+ return -ENODATA; -+ -+ err = posix_acl_to_xattr(mnt_userns, acl, buffer, size); -+ posix_acl_release(acl); -+ -+ return err; -+} -+ -+static int ntfs_xattr_set_acl(struct user_namespace *mnt_userns, -+ struct inode *inode, int type, const void *value, -+ size_t size) -+{ -+ struct posix_acl *acl; -+ int err; -+ -+ if (!(inode->i_sb->s_flags & SB_POSIXACL)) { -+ ntfs_inode_warn(inode, "add mount option \"acl\" to use acl"); -+ return -EOPNOTSUPP; -+ } -+ -+ if (!inode_owner_or_capable(mnt_userns, inode)) -+ return -EPERM; -+ -+ if (!value) { -+ acl = NULL; -+ } else { -+ acl = posix_acl_from_xattr(mnt_userns, value, size); -+ if (IS_ERR(acl)) -+ return PTR_ERR(acl); -+ -+ if (acl) { -+ err = posix_acl_valid(mnt_userns, acl); -+ if (err) -+ goto release_and_out; -+ } -+ } -+ -+ err = ntfs_set_acl(mnt_userns, inode, acl, type); -+ -+release_and_out: -+ posix_acl_release(acl); -+ return err; -+} -+ - /* - * ntfs_init_acl - Initialize the ACLs of a new inode. - * --- -2.35.1 - diff --git a/queue-5.15/series b/queue-5.15/series index f8308c301b1..60e093f7c21 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -1,4 +1,3 @@ -fs-ntfs3-restore-ntfs_xattr_get_acl-and-ntfs_xattr_s.patch pcmcia-db1xxx_ss-restrict-to-mips_db1xxx-boards.patch staging-greybus-codecs-fix-type-confusion-of-list-it.patch iio-adc-ad7124-remove-shift-from-scan_type.patch diff --git a/queue-5.17/fs-ntfs3-restore-ntfs_xattr_get_acl-and-ntfs_xattr_s.patch b/queue-5.17/fs-ntfs3-restore-ntfs_xattr_get_acl-and-ntfs_xattr_s.patch deleted file mode 100644 index f3320cb3a87..00000000000 --- a/queue-5.17/fs-ntfs3-restore-ntfs_xattr_get_acl-and-ntfs_xattr_s.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 0f4e580685afefcec7daccbbb4b5d8afab9a4c5e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 22 Oct 2021 18:15:36 +0300 -Subject: fs/ntfs3: Restore ntfs_xattr_get_acl and ntfs_xattr_set_acl functions - -From: Konstantin Komarov - -[ Upstream commit 87e21c99bad763524c953ff4d1a61ee19038ddc2 ] - -Apparently we need to maintain these functions with -ntfs_get_acl_ex and ntfs_set_acl_ex. -This commit fixes xfstest generic/099 -Fixes: 95dd8b2c1ed0 ("fs/ntfs3: Remove unnecessary functions") - -Reviewed-by: Kari Argillander -Signed-off-by: Konstantin Komarov -Signed-off-by: Sasha Levin ---- - fs/ntfs3/xattr.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 61 insertions(+) - -diff --git a/fs/ntfs3/xattr.c b/fs/ntfs3/xattr.c -index 0968565ff2ca..52ef3a60cde4 100644 ---- a/fs/ntfs3/xattr.c -+++ b/fs/ntfs3/xattr.c -@@ -681,6 +681,67 @@ static int ntfs_xattr_set_acl(struct user_namespace *mnt_userns, - return err; - } - -+static int ntfs_xattr_get_acl(struct user_namespace *mnt_userns, -+ struct inode *inode, int type, void *buffer, -+ size_t size) -+{ -+ struct posix_acl *acl; -+ int err; -+ -+ if (!(inode->i_sb->s_flags & SB_POSIXACL)) { -+ ntfs_inode_warn(inode, "add mount option \"acl\" to use acl"); -+ return -EOPNOTSUPP; -+ } -+ -+ acl = ntfs_get_acl(inode, type, false); -+ if (IS_ERR(acl)) -+ return PTR_ERR(acl); -+ -+ if (!acl) -+ return -ENODATA; -+ -+ err = posix_acl_to_xattr(mnt_userns, acl, buffer, size); -+ posix_acl_release(acl); -+ -+ return err; -+} -+ -+static int ntfs_xattr_set_acl(struct user_namespace *mnt_userns, -+ struct inode *inode, int type, const void *value, -+ size_t size) -+{ -+ struct posix_acl *acl; -+ int err; -+ -+ if (!(inode->i_sb->s_flags & SB_POSIXACL)) { -+ ntfs_inode_warn(inode, "add mount option \"acl\" to use acl"); -+ return -EOPNOTSUPP; -+ } -+ -+ if (!inode_owner_or_capable(mnt_userns, inode)) -+ return -EPERM; -+ -+ if (!value) { -+ acl = NULL; -+ } else { -+ acl = posix_acl_from_xattr(mnt_userns, value, size); -+ if (IS_ERR(acl)) -+ return PTR_ERR(acl); -+ -+ if (acl) { -+ err = posix_acl_valid(mnt_userns, acl); -+ if (err) -+ goto release_and_out; -+ } -+ } -+ -+ err = ntfs_set_acl(mnt_userns, inode, acl, type); -+ -+release_and_out: -+ posix_acl_release(acl); -+ return err; -+} -+ - /* - * ntfs_init_acl - Initialize the ACLs of a new inode. - * --- -2.35.1 - diff --git a/queue-5.17/series b/queue-5.17/series index e398f7d6691..aae71c109ff 100644 --- a/queue-5.17/series +++ b/queue-5.17/series @@ -1,4 +1,3 @@ -fs-ntfs3-restore-ntfs_xattr_get_acl-and-ntfs_xattr_s.patch pcmcia-db1xxx_ss-restrict-to-mips_db1xxx-boards.patch staging-greybus-codecs-fix-type-confusion-of-list-it.patch iio-adc-ad7124-remove-shift-from-scan_type.patch diff --git a/queue-5.18/fs-ntfs3-restore-ntfs_xattr_get_acl-and-ntfs_xattr_s.patch b/queue-5.18/fs-ntfs3-restore-ntfs_xattr_get_acl-and-ntfs_xattr_s.patch deleted file mode 100644 index ce2ee78c587..00000000000 --- a/queue-5.18/fs-ntfs3-restore-ntfs_xattr_get_acl-and-ntfs_xattr_s.patch +++ /dev/null @@ -1,96 +0,0 @@ -From c4a108af4b6bca4ebf4f0fadea6fa61fd215b0eb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 22 Oct 2021 18:15:36 +0300 -Subject: fs/ntfs3: Restore ntfs_xattr_get_acl and ntfs_xattr_set_acl functions - -From: Konstantin Komarov - -[ Upstream commit 87e21c99bad763524c953ff4d1a61ee19038ddc2 ] - -Apparently we need to maintain these functions with -ntfs_get_acl_ex and ntfs_set_acl_ex. -This commit fixes xfstest generic/099 -Fixes: 95dd8b2c1ed0 ("fs/ntfs3: Remove unnecessary functions") - -Reviewed-by: Kari Argillander -Signed-off-by: Konstantin Komarov -Signed-off-by: Sasha Levin ---- - fs/ntfs3/xattr.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 61 insertions(+) - -diff --git a/fs/ntfs3/xattr.c b/fs/ntfs3/xattr.c -index 0968565ff2ca..52ef3a60cde4 100644 ---- a/fs/ntfs3/xattr.c -+++ b/fs/ntfs3/xattr.c -@@ -681,6 +681,67 @@ static int ntfs_xattr_set_acl(struct user_namespace *mnt_userns, - return err; - } - -+static int ntfs_xattr_get_acl(struct user_namespace *mnt_userns, -+ struct inode *inode, int type, void *buffer, -+ size_t size) -+{ -+ struct posix_acl *acl; -+ int err; -+ -+ if (!(inode->i_sb->s_flags & SB_POSIXACL)) { -+ ntfs_inode_warn(inode, "add mount option \"acl\" to use acl"); -+ return -EOPNOTSUPP; -+ } -+ -+ acl = ntfs_get_acl(inode, type, false); -+ if (IS_ERR(acl)) -+ return PTR_ERR(acl); -+ -+ if (!acl) -+ return -ENODATA; -+ -+ err = posix_acl_to_xattr(mnt_userns, acl, buffer, size); -+ posix_acl_release(acl); -+ -+ return err; -+} -+ -+static int ntfs_xattr_set_acl(struct user_namespace *mnt_userns, -+ struct inode *inode, int type, const void *value, -+ size_t size) -+{ -+ struct posix_acl *acl; -+ int err; -+ -+ if (!(inode->i_sb->s_flags & SB_POSIXACL)) { -+ ntfs_inode_warn(inode, "add mount option \"acl\" to use acl"); -+ return -EOPNOTSUPP; -+ } -+ -+ if (!inode_owner_or_capable(mnt_userns, inode)) -+ return -EPERM; -+ -+ if (!value) { -+ acl = NULL; -+ } else { -+ acl = posix_acl_from_xattr(mnt_userns, value, size); -+ if (IS_ERR(acl)) -+ return PTR_ERR(acl); -+ -+ if (acl) { -+ err = posix_acl_valid(mnt_userns, acl); -+ if (err) -+ goto release_and_out; -+ } -+ } -+ -+ err = ntfs_set_acl(mnt_userns, inode, acl, type); -+ -+release_and_out: -+ posix_acl_release(acl); -+ return err; -+} -+ - /* - * ntfs_init_acl - Initialize the ACLs of a new inode. - * --- -2.35.1 - diff --git a/queue-5.18/series b/queue-5.18/series index 042c52e02fb..e88b4700cd4 100644 --- a/queue-5.18/series +++ b/queue-5.18/series @@ -1,4 +1,3 @@ -fs-ntfs3-restore-ntfs_xattr_get_acl-and-ntfs_xattr_s.patch pcmcia-db1xxx_ss-restrict-to-mips_db1xxx-boards.patch staging-greybus-codecs-fix-type-confusion-of-list-it.patch iio-adc-ad7124-remove-shift-from-scan_type.patch