Commit 2e8f9d23 authored by Kent Overstreet's avatar Kent Overstreet Committed by Kent Overstreet

bcachefs: Make sure to pass a disk reservation to bch2_extent_update()

It's needed when we split an existing compressed extent - we get a null
ptr deref without it.
Signed-off-by: default avatarKent Overstreet <kent.overstreet@gmail.com>
parent 2cd05634
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include "bcachefs.h" #include "bcachefs.h"
#include "bkey_buf.h" #include "bkey_buf.h"
#include "btree_update.h" #include "btree_update.h"
#include "buckets.h"
#include "extents.h" #include "extents.h"
#include "inode.h" #include "inode.h"
#include "io.h" #include "io.h"
...@@ -224,6 +225,8 @@ s64 bch2_remap_range(struct bch_fs *c, ...@@ -224,6 +225,8 @@ s64 bch2_remap_range(struct bch_fs *c,
BTREE_ITER_INTENT); BTREE_ITER_INTENT);
while (ret == 0 || ret == -EINTR) { while (ret == 0 || ret == -EINTR) {
struct disk_reservation disk_res = { 0 };
bch2_trans_begin(&trans); bch2_trans_begin(&trans);
if (fatal_signal_pending(current)) { if (fatal_signal_pending(current)) {
...@@ -287,8 +290,9 @@ s64 bch2_remap_range(struct bch_fs *c, ...@@ -287,8 +290,9 @@ s64 bch2_remap_range(struct bch_fs *c,
dst_end.offset - dst_iter->pos.offset)); dst_end.offset - dst_iter->pos.offset));
ret = bch2_extent_update(&trans, dst_iter, new_dst.k, ret = bch2_extent_update(&trans, dst_iter, new_dst.k,
NULL, journal_seq, &disk_res, journal_seq,
new_i_size, i_sectors_delta); new_i_size, i_sectors_delta);
bch2_disk_reservation_put(c, &disk_res);
if (ret) if (ret)
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment