From: Kent Overstreet Date: Fri, 7 Jun 2024 20:35:42 +0000 (-0400) Subject: bcachefs: add might_sleep() annotations for fsck_err() X-Git-Tag: v6.11-rc1~120^2~107 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e76a2b65b0565f55ea668ec46d54f6a00b8ea9fc;p=thirdparty%2Fkernel%2Flinux.git bcachefs: add might_sleep() annotations for fsck_err() Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/error.c b/fs/bcachefs/error.c index d95c40f1b6af8..46cd9dcb48fcc 100644 --- a/fs/bcachefs/error.c +++ b/fs/bcachefs/error.c @@ -210,6 +210,8 @@ int bch2_fsck_err(struct bch_fs *c, int ret = -BCH_ERR_fsck_ignore; const char *action_orig = "fix?", *action = action_orig; + might_sleep(); + if (!WARN_ON(err >= ARRAY_SIZE(fsck_flags_extra))) flags |= fsck_flags_extra[err]; diff --git a/fs/bcachefs/error.h b/fs/bcachefs/error.h index 777711504c35c..ba6a4f5257f43 100644 --- a/fs/bcachefs/error.h +++ b/fs/bcachefs/error.h @@ -136,7 +136,10 @@ void bch2_flush_fsck_errs(struct bch_fs *); /* XXX: mark in superblock that filesystem contains errors, if we ignore: */ #define __fsck_err_on(cond, c, _flags, _err_type, ...) \ - (unlikely(cond) ? __fsck_err(c, _flags, _err_type, __VA_ARGS__) : false) +({ \ + might_sleep(); \ + (unlikely(cond) ? __fsck_err(c, _flags, _err_type, __VA_ARGS__) : false);\ +}) \ #define need_fsck_err_on(cond, c, _err_type, ...) \ __fsck_err_on(cond, c, FSCK_CAN_IGNORE|FSCK_NEED_FSCK, _err_type, __VA_ARGS__)