diff options
Diffstat (limited to 'libbcache/error.h')
| -rw-r--r-- | libbcache/error.h | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/libbcache/error.h b/libbcache/error.h index 3f12bbe2..726b20d4 100644 --- a/libbcache/error.h +++ b/libbcache/error.h @@ -3,8 +3,8 @@ #include <linux/printk.h> -struct cache; -struct cache_set; +struct bch_dev; +struct bch_fs; /* * XXX: separate out errors that indicate on disk data is inconsistent, and flag @@ -13,13 +13,6 @@ struct cache_set; /* Error messages: */ -#define __bch_dev_error(ca, fmt, ...) \ -do { \ - char _buf[BDEVNAME_SIZE]; \ - bch_err((ca)->set, "%s: " fmt, \ - bdevname((ca)->disk_sb.bdev, _buf), ##__VA_ARGS__); \ -} while (0) - /* * Very fatal logic/inconsistency errors: these indicate that we've majorly * screwed up at runtime, i.e. it's not likely that it was just caused by the @@ -51,7 +44,7 @@ do { \ * BCH_ON_ERROR_CONTINUE mode */ -void bch_inconsistent_error(struct cache_set *); +void bch_inconsistent_error(struct bch_fs *); #define bch_fs_inconsistent(c, ...) \ do { \ @@ -70,13 +63,13 @@ do { \ /* * Later we might want to mark only the particular device inconsistent, not the - * entire cache set: + * entire filesystem: */ #define bch_dev_inconsistent(ca, ...) \ do { \ - __bch_dev_error(ca, __VA_ARGS__); \ - bch_inconsistent_error((ca)->set); \ + bch_err(ca, __VA_ARGS__); \ + bch_inconsistent_error((ca)->fs); \ } while (0) #define bch_dev_inconsistent_on(cond, ca, ...) \ @@ -152,7 +145,7 @@ enum { * mode - pretty much just due to metadata IO errors: */ -void bch_fatal_error(struct cache_set *); +void bch_fatal_error(struct bch_fs *); #define bch_fs_fatal_error(c, ...) \ do { \ @@ -171,18 +164,16 @@ do { \ #define bch_dev_fatal_error(ca, ...) \ do { \ - __bch_dev_error(ca, __VA_ARGS__); \ + bch_err(ca, __VA_ARGS__); \ bch_fatal_error(c); \ } while (0) #define bch_dev_fatal_io_error(ca, fmt, ...) \ do { \ - char _buf[BDEVNAME_SIZE]; \ - \ - printk_ratelimited(KERN_ERR bch_fmt((ca)->set, \ + printk_ratelimited(KERN_ERR bch_fmt((ca)->fs, \ "fatal IO error on %s for " fmt), \ - bdevname((ca)->disk_sb.bdev, _buf), ##__VA_ARGS__); \ - bch_fatal_error((ca)->set); \ + (ca)->name, ##__VA_ARGS__); \ + bch_fatal_error((ca)->fs); \ } while (0) #define bch_dev_fatal_io_err_on(cond, ca, ...) \ @@ -200,13 +191,13 @@ do { \ * don't (necessarily) want to shut down the fs: */ -void bch_account_io_completion(struct cache *); -void bch_account_io_completion_time(struct cache *, unsigned, int); +void bch_account_io_completion(struct bch_dev *); +void bch_account_io_completion_time(struct bch_dev *, unsigned, int); void bch_nonfatal_io_error_work(struct work_struct *); /* Does the error handling without logging a message */ -void bch_nonfatal_io_error(struct cache *); +void bch_nonfatal_io_error(struct bch_dev *); #if 0 #define bch_fs_nonfatal_io_error(c, ...) \ @@ -219,11 +210,9 @@ do { \ /* Logs message and handles the error: */ #define bch_dev_nonfatal_io_error(ca, fmt, ...) \ do { \ - char _buf[BDEVNAME_SIZE]; \ - \ - printk_ratelimited(KERN_ERR bch_fmt((ca)->set, \ + printk_ratelimited(KERN_ERR bch_fmt((ca)->fs, \ "IO error on %s for " fmt), \ - bdevname((ca)->disk_sb.bdev, _buf), ##__VA_ARGS__); \ + (ca)->name, ##__VA_ARGS__); \ bch_nonfatal_io_error(ca); \ } while (0) |