ceph: no need to check return value of debugfs_create functions

When calling debugfs functions, there is no need to ever check the
return value.  The function can work or not, but the code logic should
never do something different based on this.

This cleanup allows the return value of the functions to be made void,
as no logic should care if these files succeed or not.

Cc: "Yan, Zheng" <zyan@redhat.com>
Cc: Sage Weil <sage@redhat.com>
Cc: Ilya Dryomov <idryomov@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: ceph-devel@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20190612145538.GA18772@kroah.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/ceph/debugfs.c b/fs/ceph/debugfs.c
index b3fc5fe26a1ab47a1094194cb1835c6b18d2aefb..83cd41fa2b01ad4cdb586b8a8c1a38db53f0b7e3 100644 (file)
--- a/fs/ceph/debugfs.c
+++ b/fs/ceph/debugfs.c
@@ -245,21 +245,17 @@ void ceph_fs_debugfs_cleanup(struct ceph_fs_client *fsc)
        debugfs_remove(fsc->debugfs_mdsc);
 }
 
-int ceph_fs_debugfs_init(struct ceph_fs_client *fsc)
+void ceph_fs_debugfs_init(struct ceph_fs_client *fsc)
 {
        char name[100];
-       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,
                                    fsc->client->debugfs_dir,
                                    fsc,
                                    &congestion_kb_fops);
-       if (!fsc->debugfs_congestion_kb)
-               goto out;
 
        snprintf(name, sizeof(name), "../../bdi/%s",
                 dev_name(fsc->sb->s_bdi->dev));
@@ -267,52 +263,36 @@ int ceph_fs_debugfs_init(struct ceph_fs_client *fsc)
                debugfs_create_symlink("bdi",
                                       fsc->client->debugfs_dir,
                                       name);
-       if (!fsc->debugfs_bdi)
-               goto out;
 
        fsc->debugfs_mdsmap = debugfs_create_file("mdsmap",
                                        0400,
                                        fsc->client->debugfs_dir,
                                        fsc,
                                        &mdsmap_show_fops);
-       if (!fsc->debugfs_mdsmap)
-               goto out;
 
        fsc->debugfs_mds_sessions = debugfs_create_file("mds_sessions",
                                        0400,
                                        fsc->client->debugfs_dir,
                                        fsc,
                                        &mds_sessions_show_fops);
-       if (!fsc->debugfs_mds_sessions)
-               goto out;
 
        fsc->debugfs_mdsc = debugfs_create_file("mdsc",
                                                0400,
                                                fsc->client->debugfs_dir,
                                                fsc,
                                                &mdsc_show_fops);
-       if (!fsc->debugfs_mdsc)
-               goto out;
 
        fsc->debugfs_caps = debugfs_create_file("caps",
                                                   0400,
                                                   fsc->client->debugfs_dir,
                                                   fsc,
                                                   &caps_show_fops);
-       if (!fsc->debugfs_caps)
-               goto out;
-
-       return 0;
-
-out:
-       ceph_fs_debugfs_cleanup(fsc);
-       return err;
 }
 
 
 #else  /* CONFIG_DEBUG_FS */
 
-int ceph_fs_debugfs_init(struct ceph_fs_client *fsc)
+void ceph_fs_debugfs_init(struct ceph_fs_client *fsc)
 {
        return 0;
 }

diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index 01be7c1bc4c686c45f24f01a4a24642722aa9dac..273c94b61a3d650522d459e117e9bfcc6f510d28 100644 (file)
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -951,9 +951,7 @@ static struct dentry *ceph_real_mount(struct ceph_fs_client *fsc)
                        dout("mount opening path %s\n", path);
                }
 
-               err = ceph_fs_debugfs_init(fsc);
-               if (err < 0)
-                       goto out;
+               ceph_fs_debugfs_init(fsc);
 
                root = open_root_dentry(fsc, path, started);
                if (IS_ERR(root)) {

diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 6edab9a750f8a00211f7ccf2aa659982c684330a..ac1e17853278c14ac9d2074f2407c15c21e12b7f 100644 (file)
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -1099,7 +1099,7 @@ extern int ceph_locks_to_pagelist(struct ceph_filelock *flocks,
                                  int num_fcntl_locks, int num_flock_locks);
 
 /* debugfs.c */
-extern int ceph_fs_debugfs_init(struct ceph_fs_client *client);
+extern void ceph_fs_debugfs_init(struct ceph_fs_client *client);
 extern void ceph_fs_debugfs_cleanup(struct ceph_fs_client *client);
 
 /* quota.c */

diff --git a/include/linux/ceph/debugfs.h b/include/linux/ceph/debugfs.h
index fa5f9b7f5dbbced4b0d94b949338e6625c4bf064..cf5e840eec71a19c665fbf4641bd395572e8abf1 100644 (file)
--- a/include/linux/ceph/debugfs.h
+++ b/include/linux/ceph/debugfs.h
@@ -19,9 +19,9 @@ static const struct file_operations name##_fops = {                   \
 };
 
 /* debugfs.c */
-extern int ceph_debugfs_init(void);
+extern void ceph_debugfs_init(void);
 extern void ceph_debugfs_cleanup(void);
-extern int ceph_debugfs_client_init(struct ceph_client *client);
+extern void ceph_debugfs_client_init(struct ceph_client *client);
 extern void ceph_debugfs_client_cleanup(struct ceph_client *client);
 
 #endif

diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index 1c811c74bfc0f3123eb2ad481822aca91590c997..4eeea4d5c3ef4bff5b6bd759e0e293808e0c6401 100644 (file)
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -776,9 +776,7 @@ static int __init init_ceph_lib(void)
 {
        int ret = 0;
 
-       ret = ceph_debugfs_init();
-       if (ret < 0)
-               goto out;
+       ceph_debugfs_init();
 
        ret = ceph_crypto_init();
        if (ret < 0)
@@ -803,7 +801,6 @@ out_crypto:
        ceph_crypto_shutdown();
 out_debugfs:
        ceph_debugfs_cleanup();
-out:
        return ret;
 }
 

diff --git a/net/ceph/debugfs.c b/net/ceph/debugfs.c
index 63aef9915f759bd447fc6ae365367d2e770afad5..7cb992e55475ba4c930f4b4225c60dc3d0932c7d 100644 (file)
--- a/net/ceph/debugfs.c
+++ b/net/ceph/debugfs.c
@@ -389,12 +389,9 @@ CEPH_DEFINE_SHOW_FUNC(monc_show)
 CEPH_DEFINE_SHOW_FUNC(osdc_show)
 CEPH_DEFINE_SHOW_FUNC(client_options_show)
 
-int __init ceph_debugfs_init(void)
+void __init ceph_debugfs_init(void)
 {
        ceph_debugfs_dir = debugfs_create_dir("ceph", NULL);
-       if (!ceph_debugfs_dir)
-               return -ENOMEM;
-       return 0;
 }
 
 void ceph_debugfs_cleanup(void)
@@ -402,9 +399,8 @@ void ceph_debugfs_cleanup(void)
        debugfs_remove(ceph_debugfs_dir);
 }
 
-int ceph_debugfs_client_init(struct ceph_client *client)
+void ceph_debugfs_client_init(struct ceph_client *client)
 {
-       int ret = -ENOMEM;
        char name[80];
 
        snprintf(name, sizeof(name), "%pU.client%lld", &client->fsid,
@@ -412,56 +408,37 @@ int ceph_debugfs_client_init(struct ceph_client *client)
 
        dout("ceph_debugfs_client_init %p %s\n", client, name);
 
-       BUG_ON(client->debugfs_dir);
        client->debugfs_dir = debugfs_create_dir(name, ceph_debugfs_dir);
-       if (!client->debugfs_dir)
-               goto out;
 
        client->monc.debugfs_file = debugfs_create_file("monc",
                                                      0400,
                                                      client->debugfs_dir,
                                                      client,
                                                      &monc_show_fops);
-       if (!client->monc.debugfs_file)
-               goto out;
 
        client->osdc.debugfs_file = debugfs_create_file("osdc",
                                                      0400,
                                                      client->debugfs_dir,
                                                      client,
                                                      &osdc_show_fops);
-       if (!client->osdc.debugfs_file)
-               goto out;
 
        client->debugfs_monmap = debugfs_create_file("monmap",
                                        0400,
                                        client->debugfs_dir,
                                        client,
                                        &monmap_show_fops);
-       if (!client->debugfs_monmap)
-               goto out;
 
        client->debugfs_osdmap = debugfs_create_file("osdmap",
                                        0400,
                                        client->debugfs_dir,
                                        client,
                                        &osdmap_show_fops);
-       if (!client->debugfs_osdmap)
-               goto out;
 
        client->debugfs_options = debugfs_create_file("client_options",
                                        0400,
                                        client->debugfs_dir,
                                        client,
                                        &client_options_show_fops);
-       if (!client->debugfs_options)
-               goto out;
-
-       return 0;
-
-out:
-       ceph_debugfs_client_cleanup(client);
-       return ret;
 }
 
 void ceph_debugfs_client_cleanup(struct ceph_client *client)
@@ -477,18 +454,16 @@ void ceph_debugfs_client_cleanup(struct ceph_client *client)
 
 #else  /* CONFIG_DEBUG_FS */
 
-int __init ceph_debugfs_init(void)
+void __init ceph_debugfs_init(void)
 {
-       return 0;
 }
 
 void ceph_debugfs_cleanup(void)
 {
 }
 
-int ceph_debugfs_client_init(struct ceph_client *client)
+void ceph_debugfs_client_init(struct ceph_client *client)
 {
-       return 0;
 }
 
 void ceph_debugfs_client_cleanup(struct ceph_client *client)