summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2009-07-02 17:15:47 +0200
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2009-07-05 17:45:19 +0200
commit7fcd9c3ecbf09c0a77db7ba01aac75b32fb79a93 (patch)
treede3fc29704e9f6301f6c67ffd352f9eb524538fd /fs
parentUBIFS: fix assertion warning (diff)
downloadlinux-7fcd9c3ecbf09c0a77db7ba01aac75b32fb79a93.tar.xz
linux-7fcd9c3ecbf09c0a77db7ba01aac75b32fb79a93.zip
UBIFS: allow more than one volume to be mounted
UBIFS uses a bdi device per volume, but does not care to hand out unique names to each of them. This causes an error when trying to mount more than one volumes. Append the UBI volume and device ID to avoid that. [Amended a bit by Artem Bityutskiy] Signed-off-by: Daniel Mack <daniel@caiaq.de> Cc: Artem Bityutskiy <dedekind@infradead.org> Cc: Adrian Hunter <ext-adrian.hunter@nokia.com> Cc: linux-mtd@lists.infradead.org Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ubifs/super.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 3507d0ed542d..26d2e0d80465 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -1976,7 +1976,8 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent)
err = bdi_init(&c->bdi);
if (err)
goto out_close;
- err = bdi_register(&c->bdi, NULL, "ubifs");
+ err = bdi_register(&c->bdi, NULL, "ubifs_%d_%d",
+ c->vi.ubi_num, c->vi.vol_id);
if (err)
goto out_bdi;