aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext2/xattr_user.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2021-03-25 11:46:10 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2021-03-25 11:46:10 -0700
commit5acac83bf2e42f51ab9fd315d657798754bf0bb8 (patch)
tree564be60664226649f00798cc3afb72d72d0ed24d /fs/ext2/xattr_user.c
parentInput: cyttsp - verbose error on soft reset (diff)
parentLinux 5.12-rc4 (diff)
downloadlinux-dev-5acac83bf2e42f51ab9fd315d657798754bf0bb8.tar.xz
linux-dev-5acac83bf2e42f51ab9fd315d657798754bf0bb8.zip
Merge tag 'v5.12-rc4' into next
Sync up with the mainline to bring in newest APIs.
Diffstat (limited to 'fs/ext2/xattr_user.c')
-rw-r--r--fs/ext2/xattr_user.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext2/xattr_user.c b/fs/ext2/xattr_user.c
index c243a3b4d69d..58092449f8ff 100644
--- a/fs/ext2/xattr_user.c
+++ b/fs/ext2/xattr_user.c
@@ -30,6 +30,7 @@ ext2_xattr_user_get(const struct xattr_handler *handler,
static int
ext2_xattr_user_set(const struct xattr_handler *handler,
+ struct user_namespace *mnt_userns,
struct dentry *unused, struct inode *inode,
const char *name, const void *value,
size_t size, int flags)