diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-06-30 16:35:37 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-14 04:59:38 -0400 |
| commit | 29f20baecf850c6381a48ceb57dcefac8e15bd5b (patch) | |
| tree | 0436e075bd8499e67ae70887e3b7b1ee6f823394 /fs/bcachefs/acl.c | |
| parent | d91a7b6ebca99e6140c913038614f153bc4d4610 (diff) | |
bcachefs: Fixes for 4.19bcachefs-v4.19-backport-2.0
Diffstat (limited to 'fs/bcachefs/acl.c')
| -rw-r--r-- | fs/bcachefs/acl.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/bcachefs/acl.c b/fs/bcachefs/acl.c index 5c6ccf685094..0ed933f82189 100644 --- a/fs/bcachefs/acl.c +++ b/fs/bcachefs/acl.c @@ -212,7 +212,7 @@ bch2_acl_to_xattr(struct btree_trans *trans, return xattr; } -struct posix_acl *bch2_get_acl(struct inode *vinode, int type, bool rcu) +struct posix_acl *bch2_get_acl(struct inode *vinode, int type) { struct bch_inode_info *inode = to_bch_ei(vinode); struct bch_fs *c = inode->v.i_sb->s_fs_info; @@ -224,9 +224,6 @@ struct posix_acl *bch2_get_acl(struct inode *vinode, int type, bool rcu) struct bkey_s_c k; int ret; - if (rcu) - return ERR_PTR(-ECHILD); - bch2_trans_init(&trans, c, 0, 0); retry: bch2_trans_begin(&trans); @@ -292,8 +289,7 @@ int bch2_set_acl_trans(struct btree_trans *trans, subvol_inum inum, return ret == -ENOENT ? 0 : ret; } -int bch2_set_acl(struct user_namespace *mnt_userns, - struct inode *vinode, struct posix_acl *_acl, int type) +int bch2_set_acl(struct inode *vinode, struct posix_acl *_acl, int type) { struct bch_inode_info *inode = to_bch_ei(vinode); struct bch_fs *c = inode->v.i_sb->s_fs_info; @@ -318,7 +314,7 @@ retry: mode = inode_u.bi_mode; if (type == ACL_TYPE_ACCESS) { - ret = posix_acl_update_mode(mnt_userns, &inode->v, &mode, &acl); + ret = posix_acl_update_mode(&inode->v, &mode, &acl); if (ret) goto btree_err; } |