Re: [PATCH 09/11] sysctl: Remove the end element in sysctl table arrays
From: Jani Nikula <jani.nikula@linux.intel.com>
Date: 2023-06-21 11:18:08
Also in:
bpf, bridge, dri-devel, intel-gfx, keyrings, linux-crypto, linux-fsdevel, linux-hams, linux-hyperv, linux-nfs, linux-raid, linux-rdma, linux-s390, linux-scsi, linux-sctp, linux-trace-kernel, linux-xfs, linuxppc-dev, lkml, lvs-devel, mptcp, netdev, netfilter-devel, ocfs2-devel, xen-devel
On Wed, 21 Jun 2023, Joel Granados [off-list ref] wrote:
Remove the empty end element from all the arrays that are passed to the register sysctl calls. In some files this means reducing the explicit array size by one. Also make sure that we are using the size in ctl_table_header instead of evaluating the .procname element.
Where's the harm in removing the end elements driver by driver? This is an unwieldy patch to handle.
quoted hunk ↗ jump to hunk
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c index f43950219ffc..e4d7372afb10 100644 --- a/drivers/gpu/drm/i915/i915_perf.c +++ b/drivers/gpu/drm/i915/i915_perf.c@@ -4884,24 +4884,23 @@ int i915_perf_remove_config_ioctl(struct drm_device *dev, void *data, static struct ctl_table oa_table[] = { { - .procname = "perf_stream_paranoid", - .data = &i915_perf_stream_paranoid, - .maxlen = sizeof(i915_perf_stream_paranoid), - .mode = 0644, - .proc_handler = proc_dointvec_minmax, - .extra1 = SYSCTL_ZERO, - .extra2 = SYSCTL_ONE, - }, + .procname = "perf_stream_paranoid", + .data = &i915_perf_stream_paranoid, + .maxlen = sizeof(i915_perf_stream_paranoid), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, + }, { - .procname = "oa_max_sample_rate", - .data = &i915_oa_max_sample_rate, - .maxlen = sizeof(i915_oa_max_sample_rate), - .mode = 0644, - .proc_handler = proc_dointvec_minmax, - .extra1 = SYSCTL_ZERO, - .extra2 = &oa_sample_rate_hard_limit, - }, - {} + .procname = "oa_max_sample_rate", + .data = &i915_oa_max_sample_rate, + .maxlen = sizeof(i915_oa_max_sample_rate), + .mode = 0644, + .proc_handler = proc_dointvec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = &oa_sample_rate_hard_limit, + } };
The existing indentation is off, but fixing it doesn't really belong in this patch. BR, Jani. -- Jani Nikula, Intel Open Source Graphics Center