Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20190612145538.GA18772@kroah.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0a0762c6

fs/ceph/debugfs.c

+2 −22
Original line number Diff line number Diff line
@@ -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;

}

fs/ceph/super.c

+1 −3
Original line number Diff line number Diff line
@@ -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)) {

fs/ceph/super.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

include/linux/ceph/debugfs.h

+2 −2
Original line number Diff line number Diff line
@@ -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

net/ceph/ceph_common.c

+1 −4
Original line number Diff line number Diff line
@@ -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 @@ static int __init init_ceph_lib(void) 
	ceph_crypto_shutdown();

out_debugfs:

	ceph_debugfs_cleanup();

out:

	return ret;

}