Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[~andy/linux] / drivers / staging / lustre / lustre / llite / super25.c

diff --git a/drivers/staging/lustre/lustre/llite/super25.c b/drivers/staging/lustre/lustre/llite/super25.c
index 0beaf4e76b4b50c8833cd3b3a7eb4d14eb325bac..e21e1c760a8ec690d0a873c36e63967e9911f043 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/super25.c
+++ b/drivers/staging/lustre/lustre/llite/super25.c
@@ -187,11 +187,15 @@ static int __init init_lustre_lite(void)
        if (rc == 0)
                rc = vvp_global_init();
 
+       if (rc == 0)
+               rc = ll_xattr_init();
+
        return rc;
 }
 
 static void __exit exit_lustre_lite(void)
 {
+       ll_xattr_fini();
        vvp_global_fini();
        del_timer(&ll_capa_timer);
        ll_capa_thread_stop();