diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-03-30 17:40:25 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-03-30 17:40:37 -0400 |
| commit | e240b4ae86adb022e3266220ce9807dad8b51beb (patch) | |
| tree | 535081dc65b75f8f288f10b820eeebbd64f9e0e0 /cmd_migrate.c | |
| parent | 59abea577659ce82ff0098633caaf74076a9b4d7 (diff) | |
Update bcachefs sources to f638850417 bcachefs: bch2_trans_log_msg()
Diffstat (limited to 'cmd_migrate.c')
| -rw-r--r-- | cmd_migrate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd_migrate.c b/cmd_migrate.c index 4da3ab1b..08ec7de2 100644 --- a/cmd_migrate.c +++ b/cmd_migrate.c @@ -530,7 +530,7 @@ static ranges reserve_new_fs_space(const char *file_path, unsigned block_size, struct fiemap_iter iter; struct fiemap_extent e; - ranges extents = { NULL }; + ranges extents = { 0 }; fiemap_for_each(fd, iter, e) { if (e.fe_flags & (FIEMAP_EXTENT_UNKNOWN| @@ -603,7 +603,7 @@ static void copy_fs(struct bch_fs *c, int src_fd, const char *src_path, update_inode(c, &root_inode); - darray_free(s.extents); + darray_exit(s.extents); genradix_free(&s.hardlinks); } @@ -613,7 +613,7 @@ static void find_superblock_space(ranges extents, { struct range *i; - darray_foreach(i, extents) { + darray_for_each(extents, i) { u64 start = round_up(max(256ULL << 10, i->start), dev->bucket_size << 9); u64 end = round_down(i->end, |