diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2012-11-01 16:54:18 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-03-04 14:19:56 -0500 |
| commit | 949a77109747d5db7d559359d3ec24bade653be8 (patch) | |
| tree | 3b36de8c7c42ac7351f6c7a9034029d918fb790c /fs | |
| parent | e40753b207029dfc9e0a9e2ec4545fbd32e0a8cc (diff) | |
| download | olio-uboot-2014.01-949a77109747d5db7d559359d3ec24bade653be8.tar.xz olio-uboot-2014.01-949a77109747d5db7d559359d3ec24bade653be8.zip | |
ubifs: Allow ubifsmount volume reference by number
UBI can mount volumes by name or number The current code forces you
to name the volume by prepending every name with "ubi:".
>From fs/ubifs/super.c
* There are several ways to specify UBI volumes when mounting UBIFS:
* o ubiX_Y - UBI device number X, volume Y;
* o ubiY - UBI device number 0, volume Y;
* o ubiX:NAME - mount UBI device X, volume with name NAME;
* o ubi:NAME - mount UBI device 0, volume with name NAME.
Now any name passed in any of the above forms are allowed.
Also update the configs that referenced ubifsmount.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ubifs/super.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 30ccd98c2..9acf243ee 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -1164,10 +1164,9 @@ static struct file_system_type ubifs_fs_type = { .get_sb = ubifs_get_sb, }; -int ubifs_mount(char *vol_name) +int ubifs_mount(char *name) { int flags; - char name[80] = "ubi:"; void *data; struct vfsmount *mnt; int ret; @@ -1186,7 +1185,6 @@ int ubifs_mount(char *vol_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); |