bdi: initialize ->ra_pages and ->io_pages in bdi_init

[linux-2.6-microblaze.git] / fs / super.c

diff --git a/fs/super.c b/fs/super.c
index a288cd6..904459b 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -361,7 +361,7 @@ EXPORT_SYMBOL(deactivate_locked_super);
  */
 void deactivate_super(struct super_block *s)
 {
-        if (!atomic_add_unless(&s->s_active, -1, 1)) {
+       if (!atomic_add_unless(&s->s_active, -1, 1)) {
                down_write(&s->s_umount);
                deactivate_locked_super(s);
        }
@@ -1598,12 +1598,10 @@ int super_setup_bdi_name(struct super_block *sb, char *fmt, ...)
        int err;
        va_list args;
 
-       bdi = bdi_alloc(GFP_KERNEL);
+       bdi = bdi_alloc(NUMA_NO_NODE);
        if (!bdi)
                return -ENOMEM;
 
-       bdi->name = sb->s_type->name;
-
        va_start(args, fmt);
        err = bdi_register_va(bdi, fmt, args);
        va_end(args);