X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fjffs2%2Ffs.c;h=1d3b7a9fc828e92dcab7923a8808673695ec2d72;hb=9b6a51746ffe8d619f1097675d2dc5e303470024;hp=23029f42ae8cb691ddcb104c286bf1d60f12fedb;hpb=ef2e58ea6b9931c3a4816c66593da49bb20e3b24;p=linux-2.6

diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index 23029f42ae..1d3b7a9fc8 100644
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -670,6 +670,13 @@ static int jffs2_flash_setup(struct jffs2_sb_info *c) {
 			return ret;
 	}
 
+	/* and an UBI volume */
+	if (jffs2_ubivol(c)) {
+		ret = jffs2_ubivol_setup(c);
+		if (ret)
+			return ret;
+	}
+
 	return ret;
 }
 
@@ -688,4 +695,9 @@ void jffs2_flash_cleanup(struct jffs2_sb_info *c) {
 	if (jffs2_nor_wbuf_flash(c)) {
 		jffs2_nor_wbuf_flash_cleanup(c);
 	}
+
+	/* and an UBI volume */
+	if (jffs2_ubivol(c)) {
+		jffs2_ubivol_cleanup(c);
+	}
 }