mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-31 14:04:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

sysctl: Move default converter assignment out of do_proc_dointvec

Browse Source 
Move the converter assignment out of do_proc_dointvec into the caller.
Both the test for NULL and the assignment are meant to stay within the
sysctl.c context. This is in preparation of using a typed macro to for
the integer proc vector function.

Signed-off-by: Joel Granados <joel.granados@kernel.org>
This commit is contained in:
Joel Granados
2026-06-25 22:38:13 +02:00
parent 8cdeaa50ea
commit c2b8f4930a
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/sysctl.c
View File

@@ -591,9 +591,6 @@ static int do_proc_dointvec(const struct ctl_table *table, int dir,
vleft = table->maxlen / sizeof(*i);
left = *lenp;
if (!conv)
conv = do_proc_int_conv;
if (SYSCTL_USER_TO_KERN(dir)) {
if (proc_first_pos_non_zero_ignore(ppos, table))
goto out;
@@ -840,7 +837,7 @@ int proc_dobool(const struct ctl_table *table, int dir, void *buffer,
int proc_dointvec(const struct ctl_table *table, int dir, void *buffer,
size_t *lenp, loff_t *ppos)
{
return do_proc_dointvec(table, dir, buffer, lenp, ppos, NULL);
return do_proc_dointvec(table, dir, buffer, lenp, ppos, do_proc_int_conv);
}
/**
@@ -1090,6 +1087,8 @@ int proc_dointvec_conv(const struct ctl_table *table, int dir, void *buffer,
int (*conv)(bool *negp, unsigned long *u_ptr, int *k_ptr,
int dir, const struct ctl_table *table))
{
if (!conv)
conv = do_proc_int_conv;
return do_proc_dointvec(table, dir, buffer, lenp, ppos, conv);
}