summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2025-04-15 15:32:34 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2025-04-21 18:46:30 -0400
commit8fae948d60dbdc53278013c8103651578aee8c12 (patch)
tree9d136b288f2b26012ebed26de20ad03e0444bced
parent6a83d70ef53042aa12bf0ea1f08b7b237783f114 (diff)
fixup! posix_to_bcachefs: Process dirents in sorted order
-rw-r--r--c_src/posix_to_bcachefs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/c_src/posix_to_bcachefs.c b/c_src/posix_to_bcachefs.c
index 880ef531..3c2e72d8 100644
--- a/c_src/posix_to_bcachefs.c
+++ b/c_src/posix_to_bcachefs.c
@@ -319,7 +319,8 @@ static int dirent_cmp(const void *_l, const void *_r)
const struct dirent *l = _l;
const struct dirent *r = _r;
- return strcmp(l->d_name, r->d_name);
+ return cmp_int(l->d_type, r->d_type) ?:
+ strcmp(l->d_name, r->d_name);
}
static void copy_dir(struct copy_fs_state *s,