Loading fs/bcachefs/dirent.c +2 −2 Original line number Diff line number Diff line Loading @@ -65,7 +65,7 @@ static bool dirent_cmp_key(struct bkey_s_c _l, const void *_r) const struct qstr l_name = bch2_dirent_get_name(l); const struct qstr *r_name = _r; return l_name.len - r_name->len ?: memcmp(l_name.name, r_name->name, l_name.len); return !qstr_eq(l_name, *r_name); } static bool dirent_cmp_bkey(struct bkey_s_c _l, struct bkey_s_c _r) Loading @@ -75,7 +75,7 @@ static bool dirent_cmp_bkey(struct bkey_s_c _l, struct bkey_s_c _r) const struct qstr l_name = bch2_dirent_get_name(l); const struct qstr r_name = bch2_dirent_get_name(r); return l_name.len - r_name.len ?: memcmp(l_name.name, r_name.name, l_name.len); return !qstr_eq(l_name, r_name); } static bool dirent_is_visible(subvol_inum inum, struct bkey_s_c k) Loading fs/bcachefs/fsck.c +0 −2 Original line number Diff line number Diff line Loading @@ -20,8 +20,6 @@ #include <linux/bsearch.h> #include <linux/dcache.h> /* struct qstr */ #define QSTR(n) { { { .len = strlen(n) } }, .name = n } /* * XXX: this is handling transaction restarts without returning * -BCH_ERR_transaction_restart_nested, this is not how we do things anymore: Loading fs/bcachefs/util.h +7 −0 Original line number Diff line number Diff line Loading @@ -856,4 +856,11 @@ static inline int cmp_le32(__le32 l, __le32 r) #include <linux/uuid.h> #define QSTR(n) { { { .len = strlen(n) } }, .name = n } static inline bool qstr_eq(const struct qstr l, const struct qstr r) { return l.len == r.len && !memcmp(l.name, r.name, l.len); } #endif /* _BCACHEFS_UTIL_H */ Loading
fs/bcachefs/dirent.c +2 −2 Original line number Diff line number Diff line Loading @@ -65,7 +65,7 @@ static bool dirent_cmp_key(struct bkey_s_c _l, const void *_r) const struct qstr l_name = bch2_dirent_get_name(l); const struct qstr *r_name = _r; return l_name.len - r_name->len ?: memcmp(l_name.name, r_name->name, l_name.len); return !qstr_eq(l_name, *r_name); } static bool dirent_cmp_bkey(struct bkey_s_c _l, struct bkey_s_c _r) Loading @@ -75,7 +75,7 @@ static bool dirent_cmp_bkey(struct bkey_s_c _l, struct bkey_s_c _r) const struct qstr l_name = bch2_dirent_get_name(l); const struct qstr r_name = bch2_dirent_get_name(r); return l_name.len - r_name.len ?: memcmp(l_name.name, r_name.name, l_name.len); return !qstr_eq(l_name, r_name); } static bool dirent_is_visible(subvol_inum inum, struct bkey_s_c k) Loading
fs/bcachefs/fsck.c +0 −2 Original line number Diff line number Diff line Loading @@ -20,8 +20,6 @@ #include <linux/bsearch.h> #include <linux/dcache.h> /* struct qstr */ #define QSTR(n) { { { .len = strlen(n) } }, .name = n } /* * XXX: this is handling transaction restarts without returning * -BCH_ERR_transaction_restart_nested, this is not how we do things anymore: Loading
fs/bcachefs/util.h +7 −0 Original line number Diff line number Diff line Loading @@ -856,4 +856,11 @@ static inline int cmp_le32(__le32 l, __le32 r) #include <linux/uuid.h> #define QSTR(n) { { { .len = strlen(n) } }, .name = n } static inline bool qstr_eq(const struct qstr l, const struct qstr r) { return l.len == r.len && !memcmp(l.name, r.name, l.len); } #endif /* _BCACHEFS_UTIL_H */