From badd6954888f62956a4ceb97581c6eb175327738 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 21 Dec 2009 21:04:26 -0800
Subject: [PATCH] --- yaml --- r: 188665 b: refs/heads/master c:
 e0e3271074e1ebd0b80a912a457ce03c971bcd66 h: refs/heads/master i:   188663:
 05d6d7e2bc95c2f487e4cebf7be4155f0817c494 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ceph/super.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 281de7d27f7a..3da66e529241 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dacf09121ffb2e5fc7d15b78cae0b77042a1935
+refs/heads/master: e0e3271074e1ebd0b80a912a457ce03c971bcd66
diff --git a/trunk/fs/ceph/super.c b/trunk/fs/ceph/super.c
index b9cb8cebcdc1..cd81c84e96fc 100644
--- a/trunk/fs/ceph/super.c
+++ b/trunk/fs/ceph/super.c
@@ -942,7 +942,8 @@ static void ceph_kill_sb(struct super_block *s)
 	dout("kill_sb %p\n", s);
 	ceph_mdsc_pre_umount(&client->mdsc);
 	kill_anon_super(s);    /* will call put_super after sb is r/o */
-	bdi_unregister(&client->backing_dev_info);
+	if (s->s_bdi == &client->backing_dev_info)
+		bdi_unregister(&client->backing_dev_info);
 	bdi_destroy(&client->backing_dev_info);
 	ceph_destroy_client(client);
 }