From: Michal Simek <michal.simek@xilinx.com>
Date: Wed, 23 Jan 2013 10:32:54 +0000 (+0100)
Subject: Revert "ubifs: Allow ubifsmount volume reference by number"
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2bb1418f344296495ba5757789f7c890921bfc7a;p=thirdparty%2Fu-boot.git

Revert "ubifs: Allow ubifsmount volume reference by number"

This reverts commit 6e7cf45d9c9473ef52b36527ddd1538f5eda3c1e.

We are not using ubi support that's why let's revert this
patch and be in sync with mainline.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 9acf243eeff..30ccd98c22b 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -1164,9 +1164,10 @@ static struct file_system_type ubifs_fs_type = {
 	.get_sb  = ubifs_get_sb,
 };
 
-int ubifs_mount(char *name)
+int ubifs_mount(char *vol_name)
 {
 	int flags;
+	char name[80] = "ubi:";
 	void *data;
 	struct vfsmount *mnt;
 	int ret;
@@ -1185,6 +1186,7 @@ int ubifs_mount(char *name)
 	 * Mount in read-only mode
 	 */
 	flags = MS_RDONLY;
+	strcat(name, vol_name);
 	data = NULL;
 	mnt = NULL;
 	ret = ubifs_get_sb(&ubifs_fs_type, flags, name, data, mnt);