orangefs: clean up debugfs globals (44f46410) · Commits · e / devices / android_kernel_oneplus_sm8150

fs/orangefs/devorangefs-req.c

+4 −128

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@
		#include "orangefs-kernel.h"
		#include "orangefs-dev-proto.h"
		#include "orangefs-bufmap.h"
		#include "orangefs-debugfs.h"

		#include <linux/debugfs.h>
		#include <linux/slab.h>
		@@ -576,8 +577,6 @@ static long dispatch_ioctl_command(unsigned int command, unsigned long arg)
		static __s32 max_down_size = MAX_DEV_REQ_DOWNSIZE;
		struct ORANGEFS_dev_map_desc user_desc;
		int ret = 0;
		struct dev_mask_info_s mask_info = { 0 };
		struct dev_mask2_info_s mask2_info = { 0, 0 };
		int upstream_kmod = 1;
		struct orangefs_sb_info_s *orangefs_sb;

		@@ -668,134 +667,11 @@ static long dispatch_ioctl_command(unsigned int command, unsigned long arg)
		return ret;

		case ORANGEFS_DEV_CLIENT_MASK:
		ret = copy_from_user(&mask2_info,
		(void __user *)arg,
		sizeof(struct dev_mask2_info_s));

		if (ret != 0)
		return -EIO;

		client_debug_mask.mask1 = mask2_info.mask1_value;
		client_debug_mask.mask2 = mask2_info.mask2_value;

		pr_info("%s: client debug mask has been been received "
		":%llx: :%llx:\n",
		__func__,
		(unsigned long long)client_debug_mask.mask1,
		(unsigned long long)client_debug_mask.mask2);

		return ret;

		return orangefs_debugfs_new_client_mask((void __user *)arg);
		case ORANGEFS_DEV_CLIENT_STRING:
		ret = copy_from_user(&client_debug_array_string,
		(void __user *)arg,
		ORANGEFS_MAX_DEBUG_STRING_LEN);
		/*
		* The real client-core makes an effort to ensure
		* that actual strings that aren't too long to fit in
		* this buffer is what we get here. We're going to use
		* string functions on the stuff we got, so we'll make
		* this extra effort to try and keep from
		* flowing out of this buffer when we use the string
		* functions, even if somehow the stuff we end up
		* with here is garbage.
		*/
		client_debug_array_string[ORANGEFS_MAX_DEBUG_STRING_LEN - 1] =
		'\0';

		if (ret != 0) {
		pr_info("%s: CLIENT_STRING: copy_from_user failed\n",
		__func__);
		return -EIO;
		}

		pr_info("%s: client debug array string has been received.\n",
		__func__);

		if (!help_string_initialized) {

		/* Free the "we don't know yet" default string... */
		kfree(debug_help_string);

		/* build a proper debug help string */
		if (orangefs_prepare_debugfs_help_string(0)) {
		gossip_err("%s: no debug help string \n",
		__func__);
		return -EIO;
		}

		/* Replace the boilerplate boot-time debug-help file. */
		debugfs_remove(help_file_dentry);

		help_file_dentry =
		debugfs_create_file(
		ORANGEFS_KMOD_DEBUG_HELP_FILE,
		0444,
		debug_dir,
		debug_help_string,
		&debug_help_fops);

		if (!help_file_dentry) {
		gossip_err("%s: debugfs_create_file failed for"
		" :%s:!\n",
		__func__,
		ORANGEFS_KMOD_DEBUG_HELP_FILE);
		return -EIO;
		}
		}

		debug_mask_to_string(&client_debug_mask, 1);

		debugfs_remove(client_debug_dentry);

		orangefs_client_debug_init();

		help_string_initialized++;

		return ret;

		return orangefs_debugfs_new_client_string((void __user *)arg);
		case ORANGEFS_DEV_DEBUG:
		ret = copy_from_user(&mask_info,
		(void __user *)arg,
		sizeof(mask_info));

		if (ret != 0)
		return -EIO;

		if (mask_info.mask_type == KERNEL_MASK) {
		if ((mask_info.mask_value == 0)
		&& (kernel_mask_set_mod_init)) {
		/*
		* the kernel debug mask was set when the
		* kernel module was loaded; don't override
		* it if the client-core was started without
		* a value for ORANGEFS_KMODMASK.
		*/
		return 0;
		}
		debug_mask_to_string(&mask_info.mask_value,
		mask_info.mask_type);
		gossip_debug_mask = mask_info.mask_value;
		pr_info("%s: kernel debug mask has been modified to "
		":%s: :%llx:\n",
		__func__,
		kernel_debug_string,
		(unsigned long long)gossip_debug_mask);
		} else if (mask_info.mask_type == CLIENT_MASK) {
		debug_mask_to_string(&mask_info.mask_value,
		mask_info.mask_type);
		pr_info("%s: client debug mask has been modified to"
		":%s: :%llx:\n",
		__func__,
		client_debug_string,
		llu(mask_info.mask_value));
		} else {
		gossip_lerr("Invalid mask type....\n");
		return -EINVAL;
		}

		return ret;

		return orangefs_debugfs_new_debug((void __user *)arg);
		default:
		return -ENOIOCTLCMD;
		}

fs/orangefs/orangefs-debugfs.c

+691 −70

File changed.

Preview size limit exceeded, changes collapsed.

fs/orangefs/orangefs-debugfs.h

+6 −2

File changed.

Preview size limit exceeded, changes collapsed.

fs/orangefs/orangefs-kernel.h

+0 −33

File changed.

Preview size limit exceeded, changes collapsed.

fs/orangefs/orangefs-mod.c

+2 −51

File changed.

Preview size limit exceeded, changes collapsed.