fs: ubifs: add ubi device index to trace

When running with multiple ubi mounted file systems, there is no way to
distinguish between messages from the different mounted fs. The device
index helps distinguishing between the mounted fs messages while
debugging.

Change-Id: I8f16af689198c643ec2c82e77a26818e583b4c29
Signed-off-by: Dolev Raviv <draviv@codeaurora.org>

1 files changed, 7 insertions, 6 deletions

diff --git a/fs/ubifs/commit.c b/fs/ubifs/commit.c
index ff8229340cd..4202edd07ce 100644
--- a/fs/ubifs/commit.c
+++ b/fs/ubifs/commit.c
@@ -229,7 +229,7 @@ out_cancel:
 out_up:
 	up_write(&c->commit_sem);
 out:
-	ubifs_err("commit failed, error %d", err);
+	ubifs_err("commit failed, error %d", c->vi.ubi_num, err);
 	spin_lock(&c->cs_lock);
 	c->cmt_state = COMMIT_BROKEN;
 	wake_up(&c->cmt_wq);
@@ -293,7 +293,7 @@ int ubifs_bg_thread(void *info)
 	int err;
 	struct ubifs_info *c = info;
 
-	ubifs_msg("background thread \"%s\" started, PID %d",
+	ubifs_msg("background thread \"%s\" started, PID %d", c->vi.ubi_num,
 		  c->bgt_name, current->pid);
 	set_freezable();
 
@@ -328,7 +328,8 @@ int ubifs_bg_thread(void *info)
 		cond_resched();
 	}
 
-	ubifs_msg("background thread \"%s\" stops", c->bgt_name);
+	ubifs_msg("background thread \"%s\" stops", c->vi.ubi_num,
+			c->bgt_name);
 	return 0;
 }
 
@@ -716,13 +717,13 @@ out:
 	return 0;
 
 out_dump:
-	ubifs_err("dumping index node (iip=%d)", i->iip);
+	ubifs_err("dumping index node (iip=%d)", c->vi.ubi_num, i->iip);
 	ubifs_dump_node(c, idx);
 	list_del(&i->list);
 	kfree(i);
 	if (!list_empty(&list)) {
 		i = list_entry(list.prev, struct idx_node, list);
-		ubifs_err("dumping parent index node");
+		ubifs_err("dumping parent index node", c->vi.ubi_num);
 		ubifs_dump_node(c, &i->idx);
 	}
 out_free:
@@ -731,7 +732,7 @@ out_free:
 		list_del(&i->list);
 		kfree(i);
 	}
-	ubifs_err("failed, error %d", err);
+	ubifs_err("failed, error %d", c->vi.ubi_num, err);
 	if (err > 0)
 		err = -EINVAL;
 	return err;