aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ubifs/debug.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ubifs/debug.c')
-rw-r--r--fs/ubifs/debug.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 3eef25343393..df83d7b495fc 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -1285,24 +1285,24 @@ static int dbg_check_key_order(struct ubifs_info *c, struct ubifs_zbranch *zbr1,
1285 err = 1; 1285 err = 1;
1286 key_read(c, &dent1->key, &key); 1286 key_read(c, &dent1->key, &key);
1287 if (keys_cmp(c, &zbr1->key, &key)) { 1287 if (keys_cmp(c, &zbr1->key, &key)) {
1288 dbg_err("1st entry at %d:%d has key %s", zbr1->lnum, 1288 ubifs_err("1st entry at %d:%d has key %s", zbr1->lnum,
1289 zbr1->offs, dbg_snprintf_key(c, &key, key_buf, 1289 zbr1->offs, dbg_snprintf_key(c, &key, key_buf,
1290 DBG_KEY_BUF_LEN)); 1290 DBG_KEY_BUF_LEN));
1291 dbg_err("but it should have key %s according to tnc", 1291 ubifs_err("but it should have key %s according to tnc",
1292 dbg_snprintf_key(c, &zbr1->key, key_buf, 1292 dbg_snprintf_key(c, &zbr1->key, key_buf,
1293 DBG_KEY_BUF_LEN)); 1293 DBG_KEY_BUF_LEN));
1294 ubifs_dump_node(c, dent1); 1294 ubifs_dump_node(c, dent1);
1295 goto out_free; 1295 goto out_free;
1296 } 1296 }
1297 1297
1298 key_read(c, &dent2->key, &key); 1298 key_read(c, &dent2->key, &key);
1299 if (keys_cmp(c, &zbr2->key, &key)) { 1299 if (keys_cmp(c, &zbr2->key, &key)) {
1300 dbg_err("2nd entry at %d:%d has key %s", zbr1->lnum, 1300 ubifs_err("2nd entry at %d:%d has key %s", zbr1->lnum,
1301 zbr1->offs, dbg_snprintf_key(c, &key, key_buf, 1301 zbr1->offs, dbg_snprintf_key(c, &key, key_buf,
1302 DBG_KEY_BUF_LEN)); 1302 DBG_KEY_BUF_LEN));
1303 dbg_err("but it should have key %s according to tnc", 1303 ubifs_err("but it should have key %s according to tnc",
1304 dbg_snprintf_key(c, &zbr2->key, key_buf, 1304 dbg_snprintf_key(c, &zbr2->key, key_buf,
1305 DBG_KEY_BUF_LEN)); 1305 DBG_KEY_BUF_LEN));
1306 ubifs_dump_node(c, dent2); 1306 ubifs_dump_node(c, dent2);
1307 goto out_free; 1307 goto out_free;
1308 } 1308 }
@@ -1316,10 +1316,10 @@ static int dbg_check_key_order(struct ubifs_info *c, struct ubifs_zbranch *zbr1,
1316 goto out_free; 1316 goto out_free;
1317 } 1317 }
1318 if (cmp == 0 && nlen1 == nlen2) 1318 if (cmp == 0 && nlen1 == nlen2)
1319 dbg_err("2 xent/dent nodes with the same name"); 1319 ubifs_err("2 xent/dent nodes with the same name");
1320 else 1320 else
1321 dbg_err("bad order of colliding key %s", 1321 ubifs_err("bad order of colliding key %s",
1322 dbg_snprintf_key(c, &key, key_buf, DBG_KEY_BUF_LEN)); 1322 dbg_snprintf_key(c, &key, key_buf, DBG_KEY_BUF_LEN));
1323 1323
1324 ubifs_msg("first node at %d:%d\n", zbr1->lnum, zbr1->offs); 1324 ubifs_msg("first node at %d:%d\n", zbr1->lnum, zbr1->offs);
1325 ubifs_dump_node(c, dent1); 1325 ubifs_dump_node(c, dent1);