shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: Incremental fs: fix setxattr callbacks due to upstream changes

Browse Source 
In commit 0c5fd887d2 ("acl: move idmapped mount fixup into
vfs_{g,s}etxattr()") the signature of setxattr has changed, so fixup
incfs so that it continues to build properly.

Someday this will be merged upstream and this type of maintenance will
happen automagically...

Fixes: 0c5fd887d2 ("acl: move idmapped mount fixup into vfs_{g,s}etxattr()")
Cc: Paul Lawrence <paullawrence@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I78e4af3fb999cf0ffc1128ccc15d6af6a3b1f591
This commit is contained in:
Greg Kroah-Hartman
2022-08-03 16:35:52 +02:00
parent 97e751d393
commit 63fd983e4f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/incfs/vfs.c
View File

@@ -68,7 +68,7 @@ static int incfs_getattr(struct user_namespace *ns, const struct path *path,
static ssize_t incfs_getxattr(struct dentry *d, const char *name,
void *value, size_t size);
static ssize_t incfs_setxattr(struct user_namespace *ns, struct dentry *d,
const char *name, const void *value, size_t size,
const char *name, void *value, size_t size,
int flags);
static ssize_t incfs_listxattr(struct dentry *d, char *list, size_t size);
@@ -175,7 +175,7 @@ static int incfs_handler_setxattr(const struct xattr_handler *xh,
const char *name, const void *buffer,
size_t size, int flags)
{
return incfs_setxattr(ns, d, name, buffer, size, flags);
return incfs_setxattr(ns, d, name, (void *)buffer, size, flags);
}
static const struct xattr_handler incfs_xattr_handler = {
@@ -1710,7 +1710,7 @@ static ssize_t incfs_getxattr(struct dentry *d, const char *name,
static ssize_t incfs_setxattr(struct user_namespace *ns, struct dentry *d,
const char *name, const void *value, size_t size,
const char *name, void *value, size_t size,
int flags)
{
struct dentry_info *di = get_incfs_dentry(d);