diff options
| author | Ingo Molnar <mingo@kernel.org> | 2023-02-23 11:16:39 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2023-02-23 11:16:39 +0300 |
| commit | 585a78c1f77be305b1f6adad392f16047fb66ffd (patch) | |
| tree | 765143b487d582832c7695c9fbcae141c35baa4c /fs/ubifs/xattr.c | |
| parent | 37064583f63eca93c98a9cdf2360485ea05f617a (diff) | |
| parent | 69308402ca6f5b80a5a090ade0b13bd146891420 (diff) | |
| download | linux-585a78c1f77be305b1f6adad392f16047fb66ffd.tar.xz | |
Merge branch 'linus' into objtool/core, to pick up Xen dependencies
Pick up dependencies - freshly merged upstream via xen-next - before applying
dependent objtool changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/ubifs/xattr.c')
| -rw-r--r-- | fs/ubifs/xattr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c index 3db8486e3725..349228dd1191 100644 --- a/fs/ubifs/xattr.c +++ b/fs/ubifs/xattr.c @@ -699,7 +699,7 @@ static int xattr_get(const struct xattr_handler *handler, } static int xattr_set(const struct xattr_handler *handler, - struct user_namespace *mnt_userns, + struct mnt_idmap *idmap, struct dentry *dentry, struct inode *inode, const char *name, const void *value, size_t size, int flags) |