diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-12 18:47:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-12 18:47:17 +0200 |
| commit | 9f3eb413606b259c03ecbd20d61e5f7906681891 (patch) | |
| tree | cdbd0982a72e3427bb15bfdc6510d86745d7ec0e /fs/bcachefs/acl.h | |
| parent | 259b46204885431f2853afa2a2bffa63f3705e67 (diff) | |
| parent | 7c626ce4bae1ac14f60076d00eafe71af30450ba (diff) | |
| download | linux-9f3eb413606b259c03ecbd20d61e5f7906681891.tar.gz linux-9f3eb413606b259c03ecbd20d61e5f7906681891.tar.bz2 linux-9f3eb413606b259c03ecbd20d61e5f7906681891.zip | |
Merge 6.11-rc3 into tty-next
We need the tty/serial fixes in here to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/bcachefs/acl.h')
| -rw-r--r-- | fs/bcachefs/acl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/bcachefs/acl.h b/fs/bcachefs/acl.h index 27e7eec0f278..fe730a6bf0c1 100644 --- a/fs/bcachefs/acl.h +++ b/fs/bcachefs/acl.h @@ -28,7 +28,7 @@ void bch2_acl_to_text(struct printbuf *, const void *, size_t); #ifdef CONFIG_BCACHEFS_POSIX_ACL -struct posix_acl *bch2_get_acl(struct mnt_idmap *, struct dentry *, int); +struct posix_acl *bch2_get_acl(struct inode *, int, bool); int bch2_set_acl_trans(struct btree_trans *, subvol_inum, struct bch_inode_unpacked *, |