@@ -102,16 +102,15 @@ static void mptcp_pernet_set_defaults(struct mptcp_pernet *pernet)
102
102
}
103
103
104
104
#ifdef CONFIG_SYSCTL
105
- static int mptcp_set_scheduler (const struct net * net , const char * name )
105
+ static int mptcp_set_scheduler (char * scheduler , const char * name )
106
106
{
107
- struct mptcp_pernet * pernet = mptcp_get_pernet (net );
108
107
struct mptcp_sched_ops * sched ;
109
108
int ret = 0 ;
110
109
111
110
rcu_read_lock ();
112
111
sched = mptcp_sched_find (name );
113
112
if (sched )
114
- strscpy (pernet -> scheduler , name , MPTCP_SCHED_NAME_MAX );
113
+ strscpy (scheduler , name , MPTCP_SCHED_NAME_MAX );
115
114
else
116
115
ret = - ENOENT ;
117
116
rcu_read_unlock ();
@@ -122,19 +121,19 @@ static int mptcp_set_scheduler(const struct net *net, const char *name)
122
121
static int proc_scheduler (const struct ctl_table * ctl , int write ,
123
122
void * buffer , size_t * lenp , loff_t * ppos )
124
123
{
125
- const struct net * net = current -> nsproxy -> net_ns ;
124
+ char ( * scheduler )[ MPTCP_SCHED_NAME_MAX ] = ctl -> data ;
126
125
char val [MPTCP_SCHED_NAME_MAX ];
127
126
struct ctl_table tbl = {
128
127
.data = val ,
129
128
.maxlen = MPTCP_SCHED_NAME_MAX ,
130
129
};
131
130
int ret ;
132
131
133
- strscpy (val , mptcp_get_scheduler ( net ) , MPTCP_SCHED_NAME_MAX );
132
+ strscpy (val , * scheduler , MPTCP_SCHED_NAME_MAX );
134
133
135
134
ret = proc_dostring (& tbl , write , buffer , lenp , ppos );
136
135
if (write && ret == 0 )
137
- ret = mptcp_set_scheduler (net , val );
136
+ ret = mptcp_set_scheduler (* scheduler , val );
138
137
139
138
return ret ;
140
139
}
0 commit comments