From 63fd983e4fbefcc0c66296364bf43baf6d6d5369 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 3 Aug 2022 16:35:52 +0200 Subject: [PATCH] ANDROID: Incremental fs: fix setxattr callbacks due to upstream changes In commit 0c5fd887d2bb ("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: 0c5fd887d2bb ("acl: move idmapped mount fixup into vfs_{g,s}etxattr()") Cc: Paul Lawrence Signed-off-by: Greg Kroah-Hartman Change-Id: I78e4af3fb999cf0ffc1128ccc15d6af6a3b1f591 --- fs/incfs/vfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/incfs/vfs.c b/fs/incfs/vfs.c index 0ac6a1674cf1..50b465c10ba9 100644 --- a/fs/incfs/vfs.c +++ b/fs/incfs/vfs.c @@ -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);