diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-03-19 20:29:11 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:56 -0400 |
| commit | 50dc0f692a0dbe3e6a95d3f8e5c7e718bc9f021d (patch) | |
| tree | 5d0dcdb49c81ebd54e59c4c9cc1f379994262a48 /fs/bcachefs/acl.c | |
| parent | 8d956c2fb8f7e91370fea1d27d16c6869b8ada78 (diff) | |
| download | linux-stable-50dc0f692a0dbe3e6a95d3f8e5c7e718bc9f021d.tar.gz linux-stable-50dc0f692a0dbe3e6a95d3f8e5c7e718bc9f021d.tar.bz2 linux-stable-50dc0f692a0dbe3e6a95d3f8e5c7e718bc9f021d.zip | |
bcachefs: Require all btree iterators to be freed
We keep running into occasional bugs with btree transaction iterators
overflowing - this will make those bugs more visible.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/acl.c')
| -rw-r--r-- | fs/bcachefs/acl.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/fs/bcachefs/acl.c b/fs/bcachefs/acl.c index 3879815bcede..afb9562be2b2 100644 --- a/fs/bcachefs/acl.c +++ b/fs/bcachefs/acl.c @@ -241,12 +241,12 @@ retry: } xattr = bkey_s_c_to_xattr(bch2_btree_iter_peek_slot(iter)); - acl = bch2_acl_from_disk(xattr_val(xattr.v), le16_to_cpu(xattr.v->x_val_len)); if (!IS_ERR(acl)) set_cached_acl(&inode->v, type, acl); + bch2_trans_iter_put(&trans, iter); out: bch2_trans_exit(&trans); return acl; @@ -313,7 +313,7 @@ retry: if (type == ACL_TYPE_ACCESS) { ret = posix_acl_update_mode(idmap, &inode->v, &mode, &acl); if (ret) - goto err; + goto btree_err; } hash_info = bch2_hash_info_init(c, &inode_u); @@ -330,6 +330,8 @@ retry: &inode->ei_journal_seq, BTREE_INSERT_NOUNLOCK); btree_err: + bch2_trans_iter_put(&trans, inode_iter); + if (ret == -EINTR) goto retry; if (unlikely(ret)) @@ -356,21 +358,22 @@ int bch2_acl_chmod(struct btree_trans *trans, struct bkey_s_c_xattr xattr; struct bkey_i_xattr *new; struct posix_acl *acl; - int ret = 0; + int ret; iter = bch2_hash_lookup(trans, bch2_xattr_hash_desc, &hash_info, inode->bi_inum, &X_SEARCH(KEY_TYPE_XATTR_INDEX_POSIX_ACL_ACCESS, "", 0), BTREE_ITER_INTENT); - if (IS_ERR(iter)) - return PTR_ERR(iter) != -ENOENT ? PTR_ERR(iter) : 0; + ret = PTR_ERR_OR_ZERO(iter); + if (ret) + return ret == -ENOENT ? 0 : ret; xattr = bkey_s_c_to_xattr(bch2_btree_iter_peek_slot(iter)); - acl = bch2_acl_from_disk(xattr_val(xattr.v), le16_to_cpu(xattr.v->x_val_len)); - if (IS_ERR_OR_NULL(acl)) - return PTR_ERR(acl); + ret = PTR_ERR_OR_ZERO(acl); + if (ret || !acl) + goto err; ret = __posix_acl_chmod(&acl, GFP_KERNEL, mode); if (ret) @@ -387,6 +390,7 @@ int bch2_acl_chmod(struct btree_trans *trans, *new_acl = acl; acl = NULL; err: + bch2_trans_iter_put(trans, iter); kfree(acl); return ret; } |