From: Sage Weil <sage@newdream.net>
Date: Wed, 14 Oct 2009 21:09:07 +0000 (-0700)
Subject: ceph: initialize sb->s_bdi, bdi_unregister after kill_anon_super
X-Git-Tag: v2.6.34-rc2~9^2~166
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f2cf418cec8d61df0651a0140a92a8c75246e14f;p=karo-tx-linux.git

ceph: initialize sb->s_bdi, bdi_unregister after kill_anon_super

Writeback doesn't work without the bdi set, and writeback on
umount doesn't work if we unregister the bdi too early.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index 442a9900317e..7f7d4759a443 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -97,6 +97,7 @@ static int ceph_syncfs(struct super_block *sb, int wait)
 	dout("sync_fs %d\n", wait);
 	ceph_osdc_sync(&ceph_client(sb)->osdc);
 	ceph_mdsc_sync(&ceph_client(sb)->mdsc);
+	dout("sync_fs %d done\n", wait);
 	return 0;
 }
 
@@ -777,6 +778,7 @@ static int ceph_init_bdi(struct super_block *sb, struct ceph_client *client)
 	err = bdi_init(&client->backing_dev_info);
 	if (err < 0)
 		return err;
+	sb->s_bdi = &client->backing_dev_info;
 
 	/* set ra_pages based on rsize mount option? */
 	if (client->mount_args.rsize >= PAGE_CACHE_SIZE)
@@ -861,8 +863,8 @@ static void ceph_kill_sb(struct super_block *s)
 	struct ceph_client *client = ceph_sb_to_client(s);
 	dout("kill_sb %p\n", s);
 	ceph_mdsc_pre_umount(&client->mdsc);
-	bdi_unregister(&client->backing_dev_info);
 	kill_anon_super(s);    /* will call put_super after sb is r/o */
+	bdi_unregister(&client->backing_dev_info);
 	bdi_destroy(&client->backing_dev_info);
 	ceph_destroy_client(client);
 }