Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

1 files changed, 0 insertions, 6 deletions

diff --git a/fs/ceph/debugfs.c b/fs/ceph/debugfs.c
index 08f65faac112..0dba6915712b 100644
--- a/fs/ceph/debugfs.c
+++ b/fs/ceph/debugfs.c
@@ -210,8 +210,6 @@ int ceph_fs_debugfs_init(struct ceph_fs_client *fsc)
         if (!fsc->debugfs_congestion_kb)
                 goto out;
 
-        dout("a\n");
-
         snprintf(name, sizeof(name), "../../bdi/%s",
                  dev_name(fsc->backing_dev_info.dev));
         fsc->debugfs_bdi =
@@ -221,7 +219,6 @@ int ceph_fs_debugfs_init(struct ceph_fs_client *fsc)
         if (!fsc->debugfs_bdi)
                 goto out;
 
-        dout("b\n");
         fsc->debugfs_mdsmap = debugfs_create_file("mdsmap",
                                         0600,
                                         fsc->client->debugfs_dir,
@@ -230,7 +227,6 @@ int ceph_fs_debugfs_init(struct ceph_fs_client *fsc)
         if (!fsc->debugfs_mdsmap)
                 goto out;
 
-        dout("ca\n");
         fsc->debugfs_mdsc = debugfs_create_file("mdsc",
                                                 0600,
                                                 fsc->client->debugfs_dir,
@@ -239,7 +235,6 @@ int ceph_fs_debugfs_init(struct ceph_fs_client *fsc)
         if (!fsc->debugfs_mdsc)
                 goto out;
 
-        dout("da\n");
         fsc->debugfs_caps = debugfs_create_file("caps",
                                                    0400,
                                                    fsc->client->debugfs_dir,
@@ -248,7 +243,6 @@ int ceph_fs_debugfs_init(struct ceph_fs_client *fsc)
         if (!fsc->debugfs_caps)
                 goto out;
 
-        dout("ea\n");
         fsc->debugfs_dentry_lru = debugfs_create_file("dentry_lru",
                                         0600,
                                         fsc->client->debugfs_dir,