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/xattr.c | |
| parent | 8d956c2fb8f7e91370fea1d27d16c6869b8ada78 (diff) | |
| download | linux-50dc0f692a0dbe3e6a95d3f8e5c7e718bc9f021d.tar.gz linux-50dc0f692a0dbe3e6a95d3f8e5c7e718bc9f021d.tar.bz2 linux-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/xattr.c')
| -rw-r--r-- | fs/bcachefs/xattr.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/fs/bcachefs/xattr.c b/fs/bcachefs/xattr.c index 5692b47eb3c9..f18a795620d8 100644 --- a/fs/bcachefs/xattr.c +++ b/fs/bcachefs/xattr.c @@ -133,12 +133,9 @@ int bch2_xattr_get(struct bch_fs *c, struct bch_inode_info *inode, inode->v.i_ino, &X_SEARCH(type, name, strlen(name)), 0); - if (IS_ERR(iter)) { - bch2_trans_exit(&trans); - BUG_ON(PTR_ERR(iter) == -EINTR); - - return PTR_ERR(iter) == -ENOENT ? -ENODATA : PTR_ERR(iter); - } + ret = PTR_ERR_OR_ZERO(iter); + if (ret) + goto err; xattr = bkey_s_c_to_xattr(bch2_btree_iter_peek_slot(iter)); ret = le16_to_cpu(xattr.v->x_val_len); @@ -148,9 +145,12 @@ int bch2_xattr_get(struct bch_fs *c, struct bch_inode_info *inode, else memcpy(buffer, xattr_val(xattr.v), ret); } - + bch2_trans_iter_put(&trans, iter); +err: bch2_trans_exit(&trans); - return ret; + + BUG_ON(ret == -EINTR); + return ret == -ENOENT ? -ENODATA : ret; } int bch2_xattr_set(struct btree_trans *trans, u64 inum, @@ -294,6 +294,8 @@ ssize_t bch2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size) if (ret) break; } + bch2_trans_iter_put(&trans, iter); + ret = bch2_trans_exit(&trans) ?: ret; if (ret) |