.. | .. |
---|
54 | 54 | size_t bucket = PTR_BUCKET_NR(c, k, i); |
---|
55 | 55 | size_t r = bucket_remainder(c, PTR_OFFSET(k, i)); |
---|
56 | 56 | |
---|
57 | | - if (KEY_SIZE(k) + r > c->sb.bucket_size || |
---|
| 57 | + if (KEY_SIZE(k) + r > c->cache->sb.bucket_size || |
---|
58 | 58 | bucket < ca->sb.first_bucket || |
---|
59 | 59 | bucket >= ca->sb.nbuckets) |
---|
60 | 60 | return true; |
---|
.. | .. |
---|
75 | 75 | size_t bucket = PTR_BUCKET_NR(c, k, i); |
---|
76 | 76 | size_t r = bucket_remainder(c, PTR_OFFSET(k, i)); |
---|
77 | 77 | |
---|
78 | | - if (KEY_SIZE(k) + r > c->sb.bucket_size) |
---|
| 78 | + if (KEY_SIZE(k) + r > c->cache->sb.bucket_size) |
---|
79 | 79 | return "bad, length too big"; |
---|
80 | 80 | if (bucket < ca->sb.first_bucket) |
---|
81 | 81 | return "bad, short offset"; |
---|
.. | .. |
---|
130 | 130 | char buf[80]; |
---|
131 | 131 | |
---|
132 | 132 | bch_extent_to_text(buf, sizeof(buf), k); |
---|
133 | | - pr_err(" %s", buf); |
---|
| 133 | + pr_cont(" %s", buf); |
---|
134 | 134 | |
---|
135 | 135 | for (j = 0; j < KEY_PTRS(k); j++) { |
---|
136 | 136 | size_t n = PTR_BUCKET_NR(b->c, k, j); |
---|
137 | 137 | |
---|
138 | | - pr_err(" bucket %zu", n); |
---|
139 | | - if (n >= b->c->sb.first_bucket && n < b->c->sb.nbuckets) |
---|
140 | | - pr_err(" prio %i", |
---|
141 | | - PTR_BUCKET(b->c, k, j)->prio); |
---|
| 138 | + pr_cont(" bucket %zu", n); |
---|
| 139 | + if (n >= b->c->cache->sb.first_bucket && n < b->c->cache->sb.nbuckets) |
---|
| 140 | + pr_cont(" prio %i", |
---|
| 141 | + PTR_BUCKET(b->c, k, j)->prio); |
---|
142 | 142 | } |
---|
143 | 143 | |
---|
144 | | - pr_err(" %s\n", bch_ptr_status(b->c, k)); |
---|
| 144 | + pr_cont(" %s\n", bch_ptr_status(b->c, k)); |
---|
145 | 145 | } |
---|
146 | 146 | |
---|
147 | 147 | /* Btree ptrs */ |
---|
.. | .. |
---|
553 | 553 | |
---|
554 | 554 | if (stale && KEY_DIRTY(k)) { |
---|
555 | 555 | bch_extent_to_text(buf, sizeof(buf), k); |
---|
556 | | - pr_info("stale dirty pointer, stale %u, key: %s", |
---|
| 556 | + pr_info("stale dirty pointer, stale %u, key: %s\n", |
---|
557 | 557 | stale, buf); |
---|
558 | 558 | } |
---|
559 | 559 | |
---|