From 4aeb613af6c0731e99e663037bf1d603d9acc7ae Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 17 Aug 2020 09:24:44 +0200 Subject: [PATCH] ANDROID: add flags variable to nfs4_xattr_get_nfs4_user() nfs4 just got xattr support, so add the required extra "flags" variable as Android has an out-of-tree patch that adds this to all of these callbacks. Bug: 133515582 Bug: 136124883 Bug: 129319403 Cc: Mark Salyzyn Signed-off-by: Greg Kroah-Hartman Change-Id: I4260d16eb469047f62b37c8226c2c1c9cd04cf75 --- fs/nfs/nfs4proc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index ef1130b127dd..414d7bce06dc 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -7498,7 +7498,8 @@ static int nfs4_xattr_set_nfs4_user(const struct xattr_handler *handler, static int nfs4_xattr_get_nfs4_user(const struct xattr_handler *handler, struct dentry *unused, struct inode *inode, - const char *key, void *buf, size_t buflen) + const char *key, void *buf, size_t buflen, + int flags) { struct nfs_access_entry cache; ssize_t ret;