iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: data move path should not be trying to move reflink_p keys

Browse Source 
This was spotted when the move_extent() path tried to allocate a bio for
a reflink_p extent, but adding pages to the bio failed because we
overflowed bi_max_vecs. Oops.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet
2019-09-07 16:13:20 -04:00
committed by Kent Overstreet
parent b50dd7920d
commit 8d84260ec1
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/bcachefs/extents.h
View File

@@ -455,12 +455,11 @@ unsigned bch2_extent_is_compressed(struct bkey_s_c);
bool bch2_bkey_matches_ptr(struct bch_fs *, struct bkey_s_c, bool bch2_bkey_matches_ptr(struct bch_fs *, struct bkey_s_c,
struct bch_extent_ptr, u64); struct bch_extent_ptr, u64);
static inline bool bkey_extent_is_data(const struct bkey *k) static inline bool bkey_extent_is_direct_data(const struct bkey *k)
{ {
switch (k->type) { switch (k->type) {
case KEY_TYPE_btree_ptr: case KEY_TYPE_btree_ptr:
case KEY_TYPE_extent: case KEY_TYPE_extent:
case KEY_TYPE_reflink_p:
case KEY_TYPE_reflink_v: case KEY_TYPE_reflink_v:
return true; return true;
default: default:
@@ -468,6 +467,12 @@ static inline bool bkey_extent_is_data(const struct bkey *k)
} }
} }
static inline bool bkey_extent_is_data(const struct bkey *k)
{
return bkey_extent_is_direct_data(k) ||
k->type == KEY_TYPE_reflink_p;
}
/* /*
* Should extent be counted under inode->i_sectors? * Should extent be counted under inode->i_sectors?
*/ */

2
fs/bcachefs/move.c
View File

@@ -547,7 +547,7 @@ peek:
if (bkey_cmp(bkey_start_pos(k.k), end) >= 0) if (bkey_cmp(bkey_start_pos(k.k), end) >= 0)
break; break;
if (!bkey_extent_is_data(k.k)) if (!bkey_extent_is_direct_data(k.k))
goto next_nondata; goto next_nondata;
if (cur_inum != k.k->p.inode) { if (cur_inum != k.k->p.inode) {