mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/md/bcache/debug.c
..
..
@@ -25,8 +25,8 @@
25
25
 	for (i = (start);						\
26
26
 	     (void *) i < (void *) (start) + (KEY_SIZE(&b->key) << 9) &&\
27
27
 	     i->seq == (start)->seq;					\
28
-	     i = (void *) i + set_blocks(i, block_bytes(b->c)) *	\
29
-		 block_bytes(b->c))
28
+	     i = (void *) i + set_blocks(i, block_bytes(b->c->cache)) *	\
29
+		 block_bytes(b->c->cache))
30
30
 
31
31
 void bch_btree_verify(struct btree *b)
32
32
 {
..
..
@@ -82,14 +82,14 @@
82
82
 
83
83
 		for_each_written_bset(b, ondisk, i) {
84
84
 			unsigned int block = ((void *) i - (void *) ondisk) /
85
-				block_bytes(b->c);
85
+				block_bytes(b->c->cache);
86
86
 
87
87
 			pr_err("*** on disk block %u:\n", block);
88
88
 			bch_dump_bset(&b->keys, i, block);
89
89
 		}
90
90
 
91
91
 		pr_err("*** block %zu not written\n",
92
-		       ((void *) i - (void *) ondisk) / block_bytes(b->c));
92
+		       ((void *) i - (void *) ondisk) / block_bytes(b->c->cache));
93
93
 
94
94
 		for (j = 0; j < inmemory->keys; j++)
95
95
 			if (inmemory->d[j] != sorted->d[j])
..
..
@@ -238,7 +238,7 @@
238
238
 	if (!IS_ERR_OR_NULL(bcache_debug)) {
239
239
 		char name[50];
240
240
 
241
-		snprintf(name, 50, "bcache-%pU", c->sb.set_uuid);
241
+		snprintf(name, 50, "bcache-%pU", c->set_uuid);
242
242
 		c->debug = debugfs_create_file(name, 0400, bcache_debug, c,
243
243
 					       &cache_set_debug_ops);
244
244
 	}
..
..
@@ -251,7 +251,7 @@
251
251
 	debugfs_remove_recursive(bcache_debug);
252
252
 }
253
253
 
254
-void __init bch_debug_init(struct kobject *kobj)
254
+void __init bch_debug_init(void)
255
255
 {
256
256
 	/*
257
257
 	 * it is unnecessary to check return value of