summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2018-08-13 15:29:52 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2018-08-13 15:29:52 -0400
commit35b5ba5e102fef8f0e0660e5993ee317b121ab90 (patch)
tree408f425d0138bab8d7090367d7e70200ecc94b43
parent15f6e66e86a97245d967fedcb2f33598c174fd96 (diff)
bcachefs: Fix for slightly busted dirents from older kernelsdirent-borken-fix
-rw-r--r--fs/bcachefs/dirent.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/bcachefs/dirent.c b/fs/bcachefs/dirent.c
index 5f3e16b1ab86..a72ca67752bf 100644
--- a/fs/bcachefs/dirent.c
+++ b/fs/bcachefs/dirent.c
@@ -15,10 +15,7 @@ unsigned bch2_dirent_name_bytes(struct bkey_s_c_dirent d)
unsigned len = bkey_val_bytes(d.k) -
offsetof(struct bch_dirent, d_name);
- while (len && !d.v->d_name[len - 1])
- --len;
-
- return len;
+ return strnlen(d.v->d_name, len);
}
static unsigned dirent_val_u64s(unsigned len)