diff options
| author | Ingo Molnar <mingo@kernel.org> | 2023-02-23 09:16:39 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2023-02-23 09:16:39 +0100 |
| commit | 585a78c1f77be305b1f6adad392f16047fb66ffd (patch) | |
| tree | 765143b487d582832c7695c9fbcae141c35baa4c /fs/nfs/nfs3_fs.h | |
| parent | x86/entry: Fix unwinding from kprobe on PUSH/POP instruction (diff) | |
| parent | Merge tag 'platform-drivers-x86-v6.3-1' of git://git.kernel.org/pub/scm/linux... (diff) | |
| download | linux-585a78c1f77be305b1f6adad392f16047fb66ffd.tar.xz linux-585a78c1f77be305b1f6adad392f16047fb66ffd.zip | |
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/nfs/nfs3_fs.h')
| -rw-r--r-- | fs/nfs/nfs3_fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs3_fs.h b/fs/nfs/nfs3_fs.h index df9ca56db347..4fa37dc038b5 100644 --- a/fs/nfs/nfs3_fs.h +++ b/fs/nfs/nfs3_fs.h @@ -12,7 +12,7 @@ */ #ifdef CONFIG_NFS_V3_ACL extern struct posix_acl *nfs3_get_acl(struct inode *inode, int type, bool rcu); -extern int nfs3_set_acl(struct user_namespace *mnt_userns, struct dentry *dentry, +extern int nfs3_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, struct posix_acl *acl, int type); extern int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl, struct posix_acl *dfacl); |