diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-02-28 17:55:37 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-02-28 17:55:37 -0500 |
| commit | e7f4678827ad7bf7e294105e7bb3a53e04474070 (patch) | |
| tree | 11764fe9f55d89613414210f125ffca90c7a454f | |
| parent | 632ff7a0aa95053ac30e8ccf62fbe0b249b4f3e8 (diff) | |
bcachefs: fix variable shadowing in macro call
| -rw-r--r-- | fs/bcachefs/btree_io.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/bcachefs/btree_io.c b/fs/bcachefs/btree_io.c index 99b50f8960f9..881039b13d5a 100644 --- a/fs/bcachefs/btree_io.c +++ b/fs/bcachefs/btree_io.c @@ -947,7 +947,7 @@ enum btree_validate_ret { #define btree_err(type, c, b, i, msg, ...) \ ({ \ - char buf[200], *out = buf, *end = out + sizeof(buf); \ + char _buf[200], *out = _buf, *end = out + sizeof(_buf); \ \ out += btree_err_msg(c, b, i, b->written, write, out, end - out);\ out += scnprintf(out, end - out, ": " msg, ##__VA_ARGS__); \ @@ -955,9 +955,9 @@ enum btree_validate_ret { if (type == BTREE_ERR_FIXABLE && \ write == READ && \ !test_bit(BCH_FS_INITIAL_GC_DONE, &c->flags)) { \ - mustfix_fsck_err(c, "%s", buf); \ + mustfix_fsck_err(c, "%s", _buf); \ } else { \ - bch_err(c, "%s", buf); \ + bch_err(c, "%s", _buf); \ \ switch (type) { \ case BTREE_ERR_FIXABLE: \ |