Merge v3.6-rc3 into usb-next

[karo-tx-linux.git] / fs / ceph / debugfs.c

diff --git a/fs/ceph/debugfs.c b/fs/ceph/debugfs.c
index fb962efdacee8cdbbdff2c3324516d0356d2e2e5..6d59006bfa27e688d37499b88f45e28a22df24db 100644 (file)
--- a/fs/ceph/debugfs.c
+++ b/fs/ceph/debugfs.c
@@ -201,6 +201,7 @@ int ceph_fs_debugfs_init(struct ceph_fs_client *fsc)
        int err = -ENOMEM;
 
        dout("ceph_fs_debugfs_init\n");
+       BUG_ON(!fsc->client->debugfs_dir);
        fsc->debugfs_congestion_kb =
                debugfs_create_file("writeback_congestion_kb",
                                    0600,