forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/md/bcache/extents.c
....@@ -54,7 +54,7 @@
5454 size_t bucket = PTR_BUCKET_NR(c, k, i);
5555 size_t r = bucket_remainder(c, PTR_OFFSET(k, i));
5656
57
- if (KEY_SIZE(k) + r > c->sb.bucket_size ||
57
+ if (KEY_SIZE(k) + r > c->cache->sb.bucket_size ||
5858 bucket < ca->sb.first_bucket ||
5959 bucket >= ca->sb.nbuckets)
6060 return true;
....@@ -75,7 +75,7 @@
7575 size_t bucket = PTR_BUCKET_NR(c, k, i);
7676 size_t r = bucket_remainder(c, PTR_OFFSET(k, i));
7777
78
- if (KEY_SIZE(k) + r > c->sb.bucket_size)
78
+ if (KEY_SIZE(k) + r > c->cache->sb.bucket_size)
7979 return "bad, length too big";
8080 if (bucket < ca->sb.first_bucket)
8181 return "bad, short offset";
....@@ -130,18 +130,18 @@
130130 char buf[80];
131131
132132 bch_extent_to_text(buf, sizeof(buf), k);
133
- pr_err(" %s", buf);
133
+ pr_cont(" %s", buf);
134134
135135 for (j = 0; j < KEY_PTRS(k); j++) {
136136 size_t n = PTR_BUCKET_NR(b->c, k, j);
137137
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);
142142 }
143143
144
- pr_err(" %s\n", bch_ptr_status(b->c, k));
144
+ pr_cont(" %s\n", bch_ptr_status(b->c, k));
145145 }
146146
147147 /* Btree ptrs */
....@@ -553,7 +553,7 @@
553553
554554 if (stale && KEY_DIRTY(k)) {
555555 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",
557557 stale, buf);
558558 }
559559