aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2/fs.c
diff options
context:
space:
mode:
authorArtem Bityutskiy <dedekind@infradead.org>2006-10-04 19:15:21 +0300
committerFrank Haverkamp <haver@vnet.ibm.com>2007-04-27 14:24:08 +0300
commit0029da3bf430eea498eee8cef5933f9214534b8a (patch)
tree8fd93094f370e5bde1640df97764ac56d3f118ba /fs/jffs2/fs.c
parent801c135ce73d5df1caf3eca35b66a10824ae0707 (diff)
downloadkernel_samsung_smdk4412-0029da3bf430eea498eee8cef5933f9214534b8a.zip
kernel_samsung_smdk4412-0029da3bf430eea498eee8cef5933f9214534b8a.tar.gz
kernel_samsung_smdk4412-0029da3bf430eea498eee8cef5933f9214534b8a.tar.bz2
JFFS2: add UBI support
This patch make JFFS2 able to work with UBI volumes via the emulated MTD devices which are directly mapped to these volumes. Signed-off-by: Artem Bityutskiy <dedekind@infradead.org>
Diffstat (limited to 'fs/jffs2/fs.c')
-rw-r--r--fs/jffs2/fs.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index abb90c0..8a649f6 100644
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -672,6 +672,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;
}
@@ -690,4 +697,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);
+ }
}