LU-6142 lustre: make ldebugfs_add_vars a void function

The call to ldebugfs_add_vars() can not really fail, so have it just
return nothing, which allows us to clean up a lot of unused error
handling code.

Linux-Commit d5bf5cf9e150 ("staging: lustre: make ldebugfs_add_vars a
void function")

Test-Parameters: trivial
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: I338c573fe5cb7dbd3595247f5c3647f5c1bf949b
Reviewed-on: https://review.whamcloud.com/37744
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/fid/fid_handler.c b/lustre/fid/fid_handler.c
index 3f66122..2f2018b 100644 (file)
--- a/lustre/fid/fid_handler.c
+++ b/lustre/fid/fid_handler.c
@@ -469,13 +469,8 @@ static int seq_server_debugfs_init(struct lu_server_seq *seq)
        seq->lss_debugfs_entry = debugfs_create_dir(seq->lss_name,
                                                    seq_debugfs_dir);
 
-       rc = ldebugfs_add_vars(seq->lss_debugfs_entry,
-                              seq_server_debugfs_list, seq);
-       if (rc) {
-               CERROR("%s: Can't init sequence manager debugfs, rc %d\n",
-                      seq->lss_name, rc);
-               GOTO(out_cleanup, rc);
-       }
+       ldebugfs_add_vars(seq->lss_debugfs_entry,
+                         seq_server_debugfs_list, seq);
 
        if (seq->lss_type == LUSTRE_SEQ_CONTROLLER) {
                rc = ldebugfs_seq_create(seq->lss_debugfs_entry, "fldb", 0644,

diff --git a/lustre/fid/fid_request.c b/lustre/fid/fid_request.c
index 46ffee2..01682f4 100644 (file)
--- a/lustre/fid/fid_request.c
+++ b/lustre/fid/fid_request.c
@@ -440,26 +440,13 @@ static void seq_client_debugfs_fini(struct lu_client_seq *seq)
        debugfs_remove_recursive(seq->lcs_debugfs_entry);
 }
 
-static int seq_client_debugfs_init(struct lu_client_seq *seq)
+static void seq_client_debugfs_init(struct lu_client_seq *seq)
 {
-        int rc;
-
        seq->lcs_debugfs_entry = debugfs_create_dir(seq->lcs_name,
                                                    seq_debugfs_dir);
 
-       rc = ldebugfs_add_vars(seq->lcs_debugfs_entry,
-                              seq_client_debugfs_list, seq);
-       if (rc) {
-               CERROR("%s: Can't init sequence manager debugfs, rc %d\n",
-                      seq->lcs_name, rc);
-                GOTO(out_cleanup, rc);
-        }
-
-        RETURN(0);
-
-out_cleanup:
-       seq_client_debugfs_fini(seq);
-        return rc;
+       ldebugfs_add_vars(seq->lcs_debugfs_entry,
+                         seq_client_debugfs_list, seq);
 }
 
 void seq_client_fini(struct lu_client_seq *seq)
@@ -478,13 +465,12 @@ void seq_client_fini(struct lu_client_seq *seq)
 }
 EXPORT_SYMBOL(seq_client_fini);
 
-int seq_client_init(struct lu_client_seq *seq,
-                    struct obd_export *exp,
-                    enum lu_cli_type type,
-                    const char *prefix,
-                    struct lu_server_seq *srv)
+void seq_client_init(struct lu_client_seq *seq,
+                    struct obd_export *exp,
+                    enum lu_cli_type type,
+                    const char *prefix,
+                    struct lu_server_seq *srv)
 {
-       int rc;
        ENTRY;
 
        LASSERT(seq != NULL);
@@ -509,10 +495,7 @@ int seq_client_init(struct lu_client_seq *seq,
        snprintf(seq->lcs_name, sizeof(seq->lcs_name),
                 "cli-%s", prefix);
 
-       rc = seq_client_debugfs_init(seq);
-       if (rc)
-               seq_client_fini(seq);
-       RETURN(rc);
+       seq_client_debugfs_init(seq);
 }
 EXPORT_SYMBOL(seq_client_init);
 
@@ -521,7 +504,7 @@ int client_fid_init(struct obd_device *obd,
 {
        struct client_obd *cli = &obd->u.cli;
        char *prefix;
-       int rc;
+       int rc = 0;
        ENTRY;
 
        down_write(&cli->cl_seq_rwsem);
@@ -536,11 +519,9 @@ int client_fid_init(struct obd_device *obd,
        snprintf(prefix, MAX_OBD_NAME + 5, "cli-%s", obd->obd_name);
 
        /* Init client side sequence-manager */
-       rc = seq_client_init(cli->cl_seq, exp, type, prefix, NULL);
+       seq_client_init(cli->cl_seq, exp, type, prefix, NULL);
        OBD_FREE(prefix, MAX_OBD_NAME + 5);
 
-       GOTO(out, rc);
-
 out:
        if (rc && cli->cl_seq) {
                OBD_FREE_PTR(cli->cl_seq);
@@ -548,7 +529,7 @@ out:
        }
        up_write(&cli->cl_seq_rwsem);
 
-       return rc;
+       RETURN(rc);
 }
 EXPORT_SYMBOL(client_fid_init);
 

diff --git a/lustre/fld/fld_request.c b/lustre/fld/fld_request.c
index a8e059f..7853428 100644 (file)
--- a/lustre/fld/fld_request.c
+++ b/lustre/fld/fld_request.c
@@ -225,7 +225,7 @@ int fld_client_del_target(struct lu_client_fld *fld, u64 idx)
 
 struct dentry *fld_debugfs_dir;
 
-static int fld_client_debugfs_init(struct lu_client_fld *fld)
+static void fld_client_debugfs_init(struct lu_client_fld *fld)
 {
        ENTRY;
        fld->lcf_debugfs_entry = debugfs_create_dir(fld->lcf_name,
@@ -233,8 +233,6 @@ static int fld_client_debugfs_init(struct lu_client_fld *fld)
        ldebugfs_add_vars(fld->lcf_debugfs_entry,
                          fld_client_debugfs_list,
                          fld);
-
-       return 0;
 }
 
 void fld_client_debugfs_fini(struct lu_client_fld *fld)
@@ -252,7 +250,7 @@ int fld_client_init(struct lu_client_fld *fld,
                    const char *prefix, int hash)
 {
        int cache_size, cache_threshold;
-       int rc;
+       int rc = 0;
 
        ENTRY;
        snprintf(fld->lcf_name, sizeof(fld->lcf_name),
@@ -283,9 +281,7 @@ int fld_client_init(struct lu_client_fld *fld,
                GOTO(out, rc);
        }
 
-       rc = fld_client_debugfs_init(fld);
-       if (rc)
-               GOTO(out, rc);
+       fld_client_debugfs_init(fld);
        EXIT;
 out:
        if (rc)

diff --git a/lustre/include/lprocfs_status.h b/lustre/include/lprocfs_status.h
index 55f6391..63ee9a8 100644 (file)
--- a/lustre/include/lprocfs_status.h
+++ b/lustre/include/lprocfs_status.h
@@ -522,8 +522,8 @@ extern int lprocfs_register_stats(struct proc_dir_entry *root, const char *name,
                                   struct lprocfs_stats *stats);
 
 /* lprocfs_status.c */
-extern int ldebugfs_add_vars(struct dentry *parent, struct lprocfs_vars *var,
-                            void *data);
+extern void ldebugfs_add_vars(struct dentry *parent, struct lprocfs_vars *var,
+                             void *data);
 extern int lprocfs_add_vars(struct proc_dir_entry *root,
                            struct lprocfs_vars *var, void *data);
 

diff --git a/lustre/include/lustre_fid.h b/lustre/include/lustre_fid.h
index 1748c8d..af7a9b2 100644 (file)
--- a/lustre/include/lustre_fid.h
+++ b/lustre/include/lustre_fid.h
@@ -563,11 +563,11 @@ int seq_server_set_cli(const struct lu_env *env,
 int seq_server_check_and_alloc_super(const struct lu_env *env,
                                     struct lu_server_seq *seq);
 /* Client methods */
-int seq_client_init(struct lu_client_seq *seq,
-                    struct obd_export *exp,
-                    enum lu_cli_type type,
-                    const char *prefix,
-                    struct lu_server_seq *srv);
+void seq_client_init(struct lu_client_seq *seq,
+                    struct obd_export *exp,
+                    enum lu_cli_type type,
+                    const char *prefix,
+                    struct lu_server_seq *srv);
 
 void seq_client_fini(struct lu_client_seq *seq);
 

diff --git a/lustre/ldlm/ldlm_resource.c b/lustre/ldlm/ldlm_resource.c
index 928fa98..2976e4b 100644 (file)
--- a/lustre/ldlm/ldlm_resource.c
+++ b/lustre/ldlm/ldlm_resource.c
@@ -230,8 +230,6 @@ static struct lprocfs_vars ldlm_debugfs_list[] = {
 
 int ldlm_debugfs_setup(void)
 {
-       int rc;
-
        ENTRY;
        ldlm_debugfs_dir = debugfs_create_dir(OBD_LDLM_DEVICENAME,
                                             debugfs_lustre_root);
@@ -240,20 +238,9 @@ int ldlm_debugfs_setup(void)
        ldlm_svc_debugfs_dir = debugfs_create_dir("services",
                                                  ldlm_debugfs_dir);
 
-       rc = ldebugfs_add_vars(ldlm_debugfs_dir, ldlm_debugfs_list, NULL);
-       if (rc != 0) {
-               CERROR("LProcFS failed in ldlm-init\n");
-               GOTO(err, rc);
-       }
+       ldebugfs_add_vars(ldlm_debugfs_dir, ldlm_debugfs_list, NULL);
 
        RETURN(0);
-
-err:
-       debugfs_remove_recursive(ldlm_debugfs_dir);
-       ldlm_svc_debugfs_dir = NULL;
-       ldlm_ns_debugfs_dir = NULL;
-       ldlm_debugfs_dir = NULL;
-       RETURN(rc);
 }
 
 void ldlm_debugfs_cleanup(void)

diff --git a/lustre/lfsck/lfsck_lib.c b/lustre/lfsck/lfsck_lib.c
index 9fe3a73..4b622a7 100644 (file)
--- a/lustre/lfsck/lfsck_lib.c
+++ b/lustre/lfsck/lfsck_lib.c
@@ -1622,11 +1622,9 @@ static int lfsck_fid_init(struct lfsck_instance *lfsck)
                GOTO(out, rc = -ENOMEM);
 
        snprintf(prefix, MAX_OBD_NAME + 7, "lfsck-%s", lfsck_lfsck2name(lfsck));
-       rc = seq_client_init(lfsck->li_seq, NULL, LUSTRE_SEQ_METADATA, prefix,
+       seq_client_init(lfsck->li_seq, NULL, LUSTRE_SEQ_METADATA, prefix,
                             ss->ss_server_seq);
        OBD_FREE(prefix, MAX_OBD_NAME + 7);
-       if (rc != 0)
-               GOTO(out, rc);
 
        if (fid_is_sane(&bk->lb_last_fid))
                lfsck->li_seq->lcs_fid = bk->lb_last_fid;

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index 01dddad..742ea68 100644 (file)
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -4589,9 +4589,8 @@ out_free:
  */
 static int mdt_seq_init_cli(const struct lu_env *env, struct mdt_device *mdt)
 {
-       struct seq_server_site  *ss = mdt_seq_site(mdt);
-       int                     rc;
-       char                    *prefix;
+       struct seq_server_site *ss = mdt_seq_site(mdt);
+       char *prefix;
        ENTRY;
 
        /* check if this is adding the first MDC and controller is not yet
@@ -4609,19 +4608,12 @@ static int mdt_seq_init_cli(const struct lu_env *env, struct mdt_device *mdt)
 
        /* Note: seq_client_fini will be called in seq_site_fini */
        snprintf(prefix, MAX_OBD_NAME + 5, "ctl-%s", mdt_obd_name(mdt));
-       rc = seq_client_init(ss->ss_client_seq, NULL, LUSTRE_SEQ_METADATA,
-                            prefix, ss->ss_node_id == 0 ?  ss->ss_control_seq :
+       seq_client_init(ss->ss_client_seq, NULL, LUSTRE_SEQ_METADATA,
+                       prefix, ss->ss_node_id == 0 ?  ss->ss_control_seq :
                                                            NULL);
        OBD_FREE(prefix, MAX_OBD_NAME + 5);
-       if (rc != 0) {
-               OBD_FREE_PTR(ss->ss_client_seq);
-               ss->ss_client_seq = NULL;
-               RETURN(rc);
-       }
 
-       rc = seq_server_set_cli(env, ss->ss_server_seq, ss->ss_client_seq);
-
-       RETURN(rc);
+       RETURN(seq_server_set_cli(env, ss->ss_server_seq, ss->ss_client_seq));
 }
 
 static int mdt_seq_init(const struct lu_env *env, struct mdt_device *mdt)

diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c
index c97936a..b25968d 100644 (file)
--- a/lustre/obdclass/lprocfs_status.c
+++ b/lustre/obdclass/lprocfs_status.c
@@ -137,14 +137,13 @@ EXPORT_SYMBOL(lprocfs_add_symlink);
 
 static const struct file_operations lprocfs_generic_fops = { };
 
-int ldebugfs_add_vars(struct dentry *parent, struct lprocfs_vars *list,
-                     void *data)
+void ldebugfs_add_vars(struct dentry *parent, struct lprocfs_vars *list,
+                      void *data)
 {
        if (IS_ERR_OR_NULL(parent) || IS_ERR_OR_NULL(list))
-               return -EINVAL;
+               return;
 
        while (list->name) {
-               struct dentry *entry;
                umode_t mode = 0;
 
                if (list->proc_mode != 0000) {
@@ -155,14 +154,11 @@ int ldebugfs_add_vars(struct dentry *parent, struct lprocfs_vars *list,
                        if (list->fops->write)
                                mode |= 0200;
                }
-               entry = debugfs_create_file(list->name, mode, parent,
-                                           list->data ? : data,
-                                           list->fops ? : &lprocfs_generic_fops);
-               if (IS_ERR_OR_NULL(entry))
-                       return entry ? PTR_ERR(entry) : -ENOMEM;
+               debugfs_create_file(list->name, mode, parent,
+                                   list->data ? : data,
+                                   list->fops ? : &lprocfs_generic_fops);
                list++;
        }
-       return 0;
 }
 EXPORT_SYMBOL_GPL(ldebugfs_add_vars);
 

diff --git a/lustre/obdecho/echo_client.c b/lustre/obdecho/echo_client.c
index 4d82652..739d602 100644 (file)
--- a/lustre/obdecho/echo_client.c
+++ b/lustre/obdecho/echo_client.c
@@ -733,13 +733,11 @@ static int echo_fid_init(struct echo_device *ed, char *obd_name,
        snprintf(prefix, MAX_OBD_NAME + 5, "srv-%s", obd_name);
 
        /* Init client side sequence-manager */
-       rc = seq_client_init(ed->ed_cl_seq, NULL,
-                            LUSTRE_SEQ_METADATA,
-                            prefix, ss->ss_server_seq);
+       seq_client_init(ed->ed_cl_seq, NULL,
+                       LUSTRE_SEQ_METADATA,
+                       prefix, ss->ss_server_seq);
        ed->ed_cl_seq->lcs_width = ECHO_SEQ_WIDTH;
        OBD_FREE(prefix, MAX_OBD_NAME + 5);
-       if (rc)
-               GOTO(out_free_seq, rc);
 
        RETURN(0);
 

diff --git a/lustre/ofd/ofd_dev.c b/lustre/ofd/ofd_dev.c
index bb60e94..d0d48c1 100644 (file)
--- a/lustre/ofd/ofd_dev.c
+++ b/lustre/ofd/ofd_dev.c
@@ -842,17 +842,12 @@ int ofd_fid_init(const struct lu_env *env, struct ofd_device *ofd)
                GOTO(out_server, rc = -ENOMEM);
 
        snprintf(name, len, "%s-super", obd_name);
-       rc = seq_client_init(ss->ss_client_seq, NULL, LUSTRE_SEQ_DATA,
-                            name, NULL);
-       if (rc) {
-               CERROR("%s: seq client init error: rc = %d\n", obd_name, rc);
-               GOTO(out_client, rc);
-       }
+       seq_client_init(ss->ss_client_seq, NULL, LUSTRE_SEQ_DATA,
+                       name, NULL);
 
        rc = seq_server_set_cli(env, ss->ss_server_seq, ss->ss_client_seq);
 
        if (rc) {
-out_client:
                seq_client_fini(ss->ss_client_seq);
                OBD_FREE_PTR(ss->ss_client_seq);
                ss->ss_client_seq = NULL;

diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c
index 38cf694..c083434 100644 (file)
--- a/lustre/osd-ldiskfs/osd_handler.c
+++ b/lustre/osd-ldiskfs/osd_handler.c
@@ -7456,7 +7456,7 @@ static int osd_device_init(const struct lu_env *env, struct lu_device *d,
 static int osd_fid_init(const struct lu_env *env, struct osd_device *osd)
 {
        struct seq_server_site *ss = osd_seq_site(osd);
-       int rc;
+       int rc = 0;
 
        ENTRY;
 
@@ -7470,13 +7470,8 @@ static int osd_fid_init(const struct lu_env *env, struct osd_device *osd)
        if (osd->od_cl_seq == NULL)
                RETURN(-ENOMEM);
 
-       rc = seq_client_init(osd->od_cl_seq, NULL, LUSTRE_SEQ_METADATA,
-                            osd->od_svname, ss->ss_server_seq);
-       if (rc != 0) {
-               OBD_FREE_PTR(osd->od_cl_seq);
-               osd->od_cl_seq = NULL;
-               RETURN(rc);
-       }
+       seq_client_init(osd->od_cl_seq, NULL, LUSTRE_SEQ_METADATA,
+                       osd->od_svname, ss->ss_server_seq);
 
        if (ss->ss_node_id == 0) {
                /*

diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c
index 10ef06c..ba29c08 100644 (file)
--- a/lustre/osd-zfs/osd_handler.c
+++ b/lustre/osd-zfs/osd_handler.c
@@ -1507,8 +1507,8 @@ static int osd_obd_disconnect(struct obd_export *exp)
 
 static int osd_fid_init(const struct lu_env *env, struct osd_device *osd)
 {
-       struct seq_server_site  *ss = osd_seq_site(osd);
-       int                     rc;
+       struct seq_server_site *ss = osd_seq_site(osd);
+       int rc = 0;
        ENTRY;
 
        if (osd->od_is_ost || osd->od_cl_seq != NULL)
@@ -1521,13 +1521,8 @@ static int osd_fid_init(const struct lu_env *env, struct osd_device *osd)
        if (osd->od_cl_seq == NULL)
                RETURN(-ENOMEM);
 
-       rc = seq_client_init(osd->od_cl_seq, NULL, LUSTRE_SEQ_METADATA,
-                            osd->od_svname, ss->ss_server_seq);
-
-       if (rc != 0) {
-               OBD_FREE_PTR(osd->od_cl_seq);
-               osd->od_cl_seq = NULL;
-       }
+       seq_client_init(osd->od_cl_seq, NULL, LUSTRE_SEQ_METADATA,
+                       osd->od_svname, ss->ss_server_seq);
 
        if (ss->ss_node_id == 0) {
                /*

diff --git a/lustre/ptlrpc/nrs_crr.c b/lustre/ptlrpc/nrs_crr.c
index 680cefb..da6e417 100644 (file)
--- a/lustre/ptlrpc/nrs_crr.c
+++ b/lustre/ptlrpc/nrs_crr.c
@@ -796,7 +796,9 @@ static int nrs_crrn_lprocfs_init(struct ptlrpc_service *svc)
        if (!svc->srv_debugfs_entry)
                return 0;
 
-       return ldebugfs_add_vars(svc->srv_debugfs_entry, nrs_crrn_lprocfs_vars, NULL);
+       ldebugfs_add_vars(svc->srv_debugfs_entry, nrs_crrn_lprocfs_vars, NULL);
+
+       return 0;
 }
 
 /**

diff --git a/lustre/ptlrpc/nrs_delay.c b/lustre/ptlrpc/nrs_delay.c
index 9c1b238..936782c 100644 (file)
--- a/lustre/ptlrpc/nrs_delay.c
+++ b/lustre/ptlrpc/nrs_delay.c
@@ -795,8 +795,9 @@ static int nrs_delay_lprocfs_init(struct ptlrpc_service *svc)
        if (!svc->srv_debugfs_entry)
                return 0;
 
-       return ldebugfs_add_vars(svc->srv_debugfs_entry, nrs_delay_lprocfs_vars,
-                                NULL);
+       ldebugfs_add_vars(svc->srv_debugfs_entry, nrs_delay_lprocfs_vars, NULL);
+
+       return 0;
 }
 
 /**

diff --git a/lustre/ptlrpc/nrs_orr.c b/lustre/ptlrpc/nrs_orr.c
index 38e2d05..af10670 100644 (file)
--- a/lustre/ptlrpc/nrs_orr.c
+++ b/lustre/ptlrpc/nrs_orr.c
@@ -1884,8 +1884,9 @@ static int nrs_orr_lprocfs_init(struct ptlrpc_service *svc)
        for (i = 0; i < ARRAY_SIZE(nrs_orr_lprocfs_vars); i++)
                nrs_orr_lprocfs_vars[i].data = &lprocfs_orr_data;
 
-       return ldebugfs_add_vars(svc->srv_debugfs_entry, nrs_orr_lprocfs_vars,
-                                NULL);
+       ldebugfs_add_vars(svc->srv_debugfs_entry, nrs_orr_lprocfs_vars, NULL);
+
+       return 0;
 }
 
 static const struct ptlrpc_nrs_pol_ops nrs_orr_ops = {
@@ -1936,8 +1937,9 @@ static int nrs_trr_lprocfs_init(struct ptlrpc_service *svc)
        for (i = 0; i < ARRAY_SIZE(nrs_trr_lprocfs_vars); i++)
                nrs_trr_lprocfs_vars[i].data = &lprocfs_trr_data;
 
-       return ldebugfs_add_vars(svc->srv_debugfs_entry, nrs_trr_lprocfs_vars,
-                                NULL);
+       ldebugfs_add_vars(svc->srv_debugfs_entry, nrs_trr_lprocfs_vars, NULL);
+
+       return 0;
 }
 
 /**

diff --git a/lustre/ptlrpc/nrs_tbf.c b/lustre/ptlrpc/nrs_tbf.c
index 31079ae..e15f54d 100644 (file)
--- a/lustre/ptlrpc/nrs_tbf.c
+++ b/lustre/ptlrpc/nrs_tbf.c
@@ -3673,8 +3673,9 @@ static int nrs_tbf_lprocfs_init(struct ptlrpc_service *svc)
        if (!svc->srv_debugfs_entry)
                return 0;
 
-       return ldebugfs_add_vars(svc->srv_debugfs_entry, nrs_tbf_lprocfs_vars,
-                                NULL);
+       ldebugfs_add_vars(svc->srv_debugfs_entry, nrs_tbf_lprocfs_vars, NULL);
+
+       return 0;
 }
 
 /**