From: Kent Overstreet Date: Wed, 16 Jul 2025 21:31:31 +0000 (-0400) Subject: bcachefs: Fix bch2_maybe_casefold() when CONFIG_UTF8=n X-Git-Tag: v6.16-rc7~36^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89edfcf710875feedc4264a6c9c4e7fb55486422;p=thirdparty%2Flinux.git bcachefs: Fix bch2_maybe_casefold() when CONFIG_UTF8=n maybe_casefold() shouldn't have been nooped, just bch2_casefold(). Fixes: 94426e4201fb ("bcachefs: opts.casefold_disabled") Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/dirent.h b/fs/bcachefs/dirent.h index 2e9cbf8123c4e..0417608c18d57 100644 --- a/fs/bcachefs/dirent.h +++ b/fs/bcachefs/dirent.h @@ -26,6 +26,13 @@ struct bch_inode_info; #ifdef CONFIG_UNICODE int bch2_casefold(struct btree_trans *, const struct bch_hash_info *, const struct qstr *, struct qstr *); +#else +static inline int bch2_casefold(struct btree_trans *trans, const struct bch_hash_info *info, + const struct qstr *str, struct qstr *out_cf) +{ + return -EOPNOTSUPP; +} +#endif static inline int bch2_maybe_casefold(struct btree_trans *trans, const struct bch_hash_info *info, @@ -38,14 +45,6 @@ static inline int bch2_maybe_casefold(struct btree_trans *trans, return bch2_casefold(trans, info, str, out_cf); } } -#else -static inline int bch2_maybe_casefold(struct btree_trans *trans, - const struct bch_hash_info *info, - const struct qstr *str, struct qstr *out_cf) -{ - return -EOPNOTSUPP; -} -#endif struct qstr bch2_dirent_get_name(struct bkey_s_c_dirent);