alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-09 00:00:04 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update bcachefs sources to 7e42539c80 bcachefs: Don't overflow stack in bch2_extent_merge_inline()

Browse Source
This commit is contained in:
Kent Overstreet 2019-05-29 20:06:53 -04:00
parent 7e35389599
commit 34b9374705
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
f38382c5747090ac9160e6d5fa1386954cb1f23c 7e42539c80470cb655bbc46cd0f144de6c644523

5
libbcachefs/bkey.h
View File

@ -32,10 +32,7 @@ struct bkey_s {
#define bkey_next(_k) vstruct_next(_k) #define bkey_next(_k) vstruct_next(_k)
static inline unsigned bkey_val_u64s(const struct bkey *k) #define bkey_val_u64s(_k) ((_k)->u64s - BKEY_U64s)
{
return k->u64s - BKEY_U64s;
}
static inline size_t bkey_val_bytes(const struct bkey *k) static inline size_t bkey_val_bytes(const struct bkey *k)
{ {

7
libbcachefs/btree_iter.c
View File

@ -958,9 +958,10 @@ static void btree_iter_up(struct btree_iter *iter)
int __must_check __bch2_btree_iter_traverse(struct btree_iter *); int __must_check __bch2_btree_iter_traverse(struct btree_iter *);
static int __btree_iter_traverse_all(struct btree_trans *trans, static int __btree_iter_traverse_all(struct btree_trans *trans,
struct btree_iter *iter, int ret) struct btree_iter *orig_iter, int ret)
{ {
struct bch_fs *c = trans->c; struct bch_fs *c = trans->c;
struct btree_iter *iter;
u8 sorted[BTREE_ITER_MAX]; u8 sorted[BTREE_ITER_MAX];
unsigned i, nr_sorted = 0; unsigned i, nr_sorted = 0;
@ -989,8 +990,8 @@ retry_all:
if (unlikely(ret == -EIO)) { if (unlikely(ret == -EIO)) {
trans->error = true; trans->error = true;
iter->flags |= BTREE_ITER_ERROR; orig_iter->flags |= BTREE_ITER_ERROR;
iter->l[iter->level].b = BTREE_ITER_NO_NODE_ERROR; orig_iter->l[orig_iter->level].b = BTREE_ITER_NO_NODE_ERROR;
goto out; goto out;
} }

4
libbcachefs/extents.c
View File

@ -1651,6 +1651,10 @@ static bool bch2_extent_merge_inline(struct bch_fs *c,
EBUG_ON(bkey_written(b, m)); EBUG_ON(bkey_written(b, m));
if (bkey_val_u64s(l) > BKEY_EXTENT_VAL_U64s_MAX ||
bkey_val_u64s(r) > BKEY_EXTENT_VAL_U64s_MAX)
return BCH_MERGE_NOMERGE;
/* /*
* We need to save copies of both l and r, because we might get a * We need to save copies of both l and r, because we might get a
* partial merge (which modifies both) and then fails to repack * partial merge (which modifies both) and then fails to repack

3
libbcachefs/movinggc.c
View File

@ -282,7 +282,8 @@ int bch2_copygc_start(struct bch_fs *c, struct bch_dev *ca)
{ {
struct task_struct *t; struct task_struct *t;
BUG_ON(ca->copygc_thread); if (ca->copygc_thread)
return 0;
if (c->opts.nochanges) if (c->opts.nochanges)
return 0; return 0;