aboutsummaryrefslogtreecommitdiffstats
path: root/fs/jffs2/fs.c
diff options
context:
space:
mode:
authorArtem Bityutskiy <dedekind@infradead.org>2006-10-04 12:15:21 -0400
committerFrank Haverkamp <haver@vnet.ibm.com>2007-04-27 07:24:08 -0400
commit0029da3bf430eea498eee8cef5933f9214534b8a (patch)
tree8fd93094f370e5bde1640df97764ac56d3f118ba /fs/jffs2/fs.c
parent801c135ce73d5df1caf3eca35b66a10824ae0707 (diff)
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 abb90c0c09cc..8a649f602767 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) {
672 return ret; 672 return ret;
673 } 673 }
674 674
675 /* and an UBI volume */
676 if (jffs2_ubivol(c)) {
677 ret = jffs2_ubivol_setup(c);
678 if (ret)
679 return ret;
680 }
681
675 return ret; 682 return ret;
676} 683}
677 684
@@ -690,4 +697,9 @@ void jffs2_flash_cleanup(struct jffs2_sb_info *c) {
690 if (jffs2_nor_wbuf_flash(c)) { 697 if (jffs2_nor_wbuf_flash(c)) {
691 jffs2_nor_wbuf_flash_cleanup(c); 698 jffs2_nor_wbuf_flash_cleanup(c);
692 } 699 }
700
701 /* and an UBI volume */
702 if (jffs2_ubivol(c)) {
703 jffs2_ubivol_cleanup(c);
704 }
693} 705}