1 files changed, 2 insertions, 0 deletions

diff --git a/fs/jffs2/build.c b/fs/jffs2/build.c
index 70f7a896c04a..02826967ab58 100644
--- a/fs/jffs2/build.c
+++ b/fs/jffs2/build.c
@@ -160,6 +160,7 @@ static int jffs2_build_filesystem(struct jffs2_sb_info *c)
                 ic->scan_dents = NULL;
                 cond_resched();
         }
+        jffs2_build_xattr_subsystem(c);
         c->flags &= ~JFFS2_SB_FLAG_BUILDING;
 
         dbg_fsbuild("FS build complete\n");
@@ -178,6 +179,7 @@ exit:
                                 jffs2_free_full_dirent(fd);
                         }
                 }
+                jffs2_clear_xattr_subsystem(c);
         }
 
         return ret;