diff options
Diffstat (limited to 'android-mainline/FIXME-ovl-Leftover-from-Merge-tag-v6.7-into-android-mainline.patch')
| -rw-r--r-- | android-mainline/FIXME-ovl-Leftover-from-Merge-tag-v6.7-into-android-mainline.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/android-mainline/FIXME-ovl-Leftover-from-Merge-tag-v6.7-into-android-mainline.patch b/android-mainline/FIXME-ovl-Leftover-from-Merge-tag-v6.7-into-android-mainline.patch new file mode 100644 index 00000000..39843b82 --- /dev/null +++ b/android-mainline/FIXME-ovl-Leftover-from-Merge-tag-v6.7-into-android-mainline.patch @@ -0,0 +1,50 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Lee Jones <joneslee@google.com> +Date: Tue, 30 Jan 2024 09:07:40 +0000 +Subject: FIXME: ovl: Leftover from "Merge tag 'v6.7' into android-mainline" + +Signed-off-by: Lee Jones <joneslee@google.com> +Change-Id: Ia1901747e769baa4033d57557b26bd25d3ff121b +--- + fs/overlayfs/xattrs.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/fs/overlayfs/xattrs.c b/fs/overlayfs/xattrs.c +--- a/fs/overlayfs/xattrs.c ++++ b/fs/overlayfs/xattrs.c +@@ -47,7 +47,7 @@ static int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const char + ovl_path_lower(dentry, &realpath); + old_cred = ovl_override_creds(dentry->d_sb); + err = vfs_getxattr(mnt_idmap(realpath.mnt), realdentry, name, NULL, 0); +- revert_creds(old_cred); ++ ovl_revert_creds(dentry->d_sb, old_cred); + if (err < 0) + goto out; + } +@@ -72,7 +72,7 @@ static int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const char + WARN_ON(flags != XATTR_REPLACE); + err = ovl_do_removexattr(ofs, realdentry, name); + } +- revert_creds(old_cred); ++ ovl_revert_creds(dentry->d_sb, old_cred); + ovl_drop_write(dentry); + + /* copy c/mtime */ +@@ -91,7 +91,7 @@ static int ovl_xattr_get(struct dentry *dentry, struct inode *inode, const char + ovl_i_path_real(inode, &realpath); + old_cred = ovl_override_creds(dentry->d_sb); + res = vfs_getxattr(mnt_idmap(realpath.mnt), realpath.dentry, name, value, size); +- revert_creds(old_cred); ++ ovl_revert_creds(dentry->d_sb, old_cred); + return res; + } + +@@ -121,7 +121,7 @@ ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size) + + old_cred = ovl_override_creds(dentry->d_sb); + res = vfs_listxattr(realdentry, list, size); +- revert_creds(old_cred); ++ ovl_revert_creds(dentry->d_sb, old_cred); + if (res <= 0 || size == 0) + return res; + |