Commit b145f49f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: lustre: unwrap some ldebugfs_register() calls 



When the third option (list) to ldebugfs_register() is NULL, it's the
same as just calling debugfs_create_dir().  So unwind this and call
debugfs_create_dir() directly.

This ends up saving lots of code as we do not need to do any error
checking of the return value (because it does not matter).

The ldebugfs_register() call will be removed in a later patch when it is
fully removed, right now there are 2 outstanding users of it in the
tree.

Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: James Simmons <jsimmons@infradead.org>
Cc: NeilBrown <neilb@suse.com>
Cc: Aastha Gupta <aastha.gupta4104@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Quentin Bouget <quentin.bouget@cea.fr>
Cc: Patrick Farrell <paf@cray.com>
Cc: Aliaksei Karaliou <akaraliou.dev@gmail.com>
Cc: "John L. Hammond" <john.hammond@intel.com>
Cc: Mathias Rav <mathiasrav@gmail.com>
Cc: Andriy Skulysh <andriy.skulysh@seagate.com>
Cc: Ben Evans <bevans@cray.com>
Cc: Bob Glosman <bob.glossman@intel.com>
Cc: lustre-devel@lists.lustre.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 08bd45fd

drivers/staging/lustre/lustre/fid/fid_request.c

+5 −15
Original line number Diff line number Diff line
@@ -299,17 +299,8 @@ static int seq_client_debugfs_init(struct lu_client_seq *seq) 
{

	int rc;



	seq->lcs_debugfs_entry = ldebugfs_register(seq->lcs_name,

						   seq_debugfs_dir,

						   NULL, NULL);



	if (IS_ERR_OR_NULL(seq->lcs_debugfs_entry)) {

		CERROR("%s: LdebugFS failed in seq-init\n", seq->lcs_name);

		rc = seq->lcs_debugfs_entry ? PTR_ERR(seq->lcs_debugfs_entry)

					    : -ENOMEM;

		seq->lcs_debugfs_entry = NULL;

		return 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);
@@ -424,10 +415,9 @@ static int __init fid_init(void) 
	if (rc)

		return rc;



	seq_debugfs_dir = ldebugfs_register(LUSTRE_SEQ_NAME,

					    debugfs_lustre_root,

					    NULL, NULL);

	return PTR_ERR_OR_ZERO(seq_debugfs_dir);

	seq_debugfs_dir = debugfs_create_dir(LUSTRE_SEQ_NAME,

					     debugfs_lustre_root);

	return 0;

}



static void __exit fid_exit(void)

drivers/staging/lustre/lustre/fld/fld_request.c

+5 −15
Original line number Diff line number Diff line
@@ -221,17 +221,8 @@ static int fld_client_debugfs_init(struct lu_client_fld *fld) 
{

	int rc;



	fld->lcf_debugfs_entry = ldebugfs_register(fld->lcf_name,

						   fld_debugfs_dir,

						   NULL, NULL);



	if (IS_ERR_OR_NULL(fld->lcf_debugfs_entry)) {

		CERROR("%s: LdebugFS failed in fld-init\n", fld->lcf_name);

		rc = fld->lcf_debugfs_entry ? PTR_ERR(fld->lcf_debugfs_entry)

					    : -ENOMEM;

		fld->lcf_debugfs_entry = NULL;

		return rc;

	}

	fld->lcf_debugfs_entry = debugfs_create_dir(fld->lcf_name,

						    fld_debugfs_dir);



	rc = ldebugfs_add_vars(fld->lcf_debugfs_entry,

			       fld_client_debugfs_list, fld);
@@ -455,10 +446,9 @@ static int __init fld_init(void) 
	if (rc)

		return rc;



	fld_debugfs_dir = ldebugfs_register(LUSTRE_FLD_NAME,

					    debugfs_lustre_root,

					    NULL, NULL);

	return PTR_ERR_OR_ZERO(fld_debugfs_dir);

	fld_debugfs_dir = debugfs_create_dir(LUSTRE_FLD_NAME,

					     debugfs_lustre_root);

	return 0;

}



static void __exit fld_exit(void)

drivers/staging/lustre/lustre/ldlm/ldlm_pool.c

+1 −8
Original line number Diff line number Diff line
@@ -572,14 +572,7 @@ static int ldlm_pool_debugfs_init(struct ldlm_pool *pl) 
		rc = -EINVAL;

		goto out_free_name;

	}

	pl->pl_debugfs_entry = ldebugfs_register("pool", debugfs_ns_parent,

						 NULL, NULL);

	if (IS_ERR(pl->pl_debugfs_entry)) {

		CERROR("LdebugFS failed in ldlm-pool-init\n");

		rc = PTR_ERR(pl->pl_debugfs_entry);

		pl->pl_debugfs_entry = NULL;

		goto out_free_name;

	}

	pl->pl_debugfs_entry = debugfs_create_dir("pool", debugfs_ns_parent);



	var_name[MAX_STRING_SIZE] = '\0';

	memset(pool_vars, 0, sizeof(pool_vars));

drivers/staging/lustre/lustre/ldlm/ldlm_resource.c

+5 −29
Original line number Diff line number Diff line
@@ -110,34 +110,13 @@ int ldlm_debugfs_setup(void) 
{

	int rc;



	ldlm_debugfs_dir = ldebugfs_register(OBD_LDLM_DEVICENAME,

					     debugfs_lustre_root,

					     NULL, NULL);

	if (IS_ERR_OR_NULL(ldlm_debugfs_dir)) {

		CERROR("LProcFS failed in ldlm-init\n");

		rc = ldlm_debugfs_dir ? PTR_ERR(ldlm_debugfs_dir) : -ENOMEM;

		goto err;

	}

	ldlm_debugfs_dir = debugfs_create_dir(OBD_LDLM_DEVICENAME,

					      debugfs_lustre_root);



	ldlm_ns_debugfs_dir = ldebugfs_register("namespaces",

						ldlm_debugfs_dir,

						NULL, NULL);

	if (IS_ERR_OR_NULL(ldlm_ns_debugfs_dir)) {

		CERROR("LProcFS failed in ldlm-init\n");

		rc = ldlm_ns_debugfs_dir ? PTR_ERR(ldlm_ns_debugfs_dir)

					 : -ENOMEM;

		goto err_type;

	}

	ldlm_ns_debugfs_dir = debugfs_create_dir("namespaces",

						 ldlm_debugfs_dir);



	ldlm_svc_debugfs_dir = ldebugfs_register("services",

						 ldlm_debugfs_dir,

						 NULL, NULL);

	if (IS_ERR_OR_NULL(ldlm_svc_debugfs_dir)) {

		CERROR("LProcFS failed in ldlm-init\n");

		rc = ldlm_svc_debugfs_dir ? PTR_ERR(ldlm_svc_debugfs_dir)

					  : -ENOMEM;

		goto err_ns;

	}

	ldlm_svc_debugfs_dir = debugfs_create_dir("services", ldlm_debugfs_dir);



	rc = ldebugfs_add_vars(ldlm_debugfs_dir, ldlm_debugfs_list, NULL);

	if (rc) {
@@ -149,11 +128,8 @@ int ldlm_debugfs_setup(void) 


err_svc:

	ldebugfs_remove(&ldlm_svc_debugfs_dir);

err_ns:

	ldebugfs_remove(&ldlm_ns_debugfs_dir);

err_type:

	ldebugfs_remove(&ldlm_debugfs_dir);

err:

	ldlm_svc_debugfs_dir = NULL;

	ldlm_ns_debugfs_dir = NULL;

	ldlm_debugfs_dir = NULL;

drivers/staging/lustre/lustre/llite/lproc_llite.c

+1 −6
Original line number Diff line number Diff line
@@ -1157,12 +1157,7 @@ int ldebugfs_register_mountpoint(struct dentry *parent, 
	snprintf(name, MAX_STRING_SIZE, "%.*s-%p", len,

		 lsi->lsi_lmd->lmd_profile, sb);



	dir = ldebugfs_register(name, parent, NULL, NULL);

	if (IS_ERR_OR_NULL(dir)) {

		err = dir ? PTR_ERR(dir) : -ENOMEM;

		sbi->ll_debugfs_entry = NULL;

		return err;

	}

	dir = debugfs_create_dir(name, parent);

	sbi->ll_debugfs_entry = dir;



	debugfs_create_file("dump_page_cache", 0444, dir, sbi,