ubifs: Convert to separately allocated bdi

[sfrench/cifs-2.6.git] / fs / ubifs / super.c

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index b73811bd7676d6221243f21d52b06d9efed7cf4a..cf4cc99b75b55531789a03b065d86f521489f67e 100644 (file)
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -1827,7 +1827,6 @@ static void ubifs_put_super(struct super_block *sb)
        }
 
        ubifs_umount(c);
-       bdi_destroy(&c->bdi);
        ubi_close_volume(c->ubi);
        mutex_unlock(&c->umount_mutex);
 }
@@ -2019,29 +2018,25 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent)
                goto out;
        }
 
+       err = ubifs_parse_options(c, data, 0);
+       if (err)
+               goto out_close;
+
        /*
         * UBIFS provides 'backing_dev_info' in order to disable read-ahead. For
         * UBIFS, I/O is not deferred, it is done immediately in readpage,
         * which means the user would have to wait not just for their own I/O
         * but the read-ahead I/O as well i.e. completely pointless.
         *
-        * Read-ahead will be disabled because @c->bdi.ra_pages is 0.
+        * Read-ahead will be disabled because @sb->s_bdi->ra_pages is 0. Also
+        * @sb->s_bdi->capabilities are initialized to 0 so there won't be any
+        * writeback happening.
         */
-       c->bdi.name = "ubifs",
-       c->bdi.capabilities = 0;
-       err  = bdi_init(&c->bdi);
+       err = super_setup_bdi_name(sb, "ubifs_%d_%d", c->vi.ubi_num,
+                                  c->vi.vol_id);
        if (err)
                goto out_close;
-       err = bdi_register(&c->bdi, NULL, "ubifs_%d_%d",
-                          c->vi.ubi_num, c->vi.vol_id);
-       if (err)
-               goto out_bdi;
-
-       err = ubifs_parse_options(c, data, 0);
-       if (err)
-               goto out_bdi;
 
-       sb->s_bdi = &c->bdi;
        sb->s_fs_info = c;
        sb->s_magic = UBIFS_SUPER_MAGIC;
        sb->s_blocksize = UBIFS_BLOCK_SIZE;
@@ -2080,8 +2075,6 @@ out_umount:
        ubifs_umount(c);
 out_unlock:
        mutex_unlock(&c->umount_mutex);
-out_bdi:
-       bdi_destroy(&c->bdi);
 out_close:
        ubi_close_volume(c->ubi);
 out: