@@ -192,7 +192,7 @@ static void mpol_relative_nodemask(nodemask_t *ret, const nodemask_t *orig,
192
192
nodes_onto (* ret , tmp , * rel );
193
193
}
194
194
195
- static int mpol_new_interleave (struct mempolicy * pol , const nodemask_t * nodes )
195
+ static int mpol_new_nodemask (struct mempolicy * pol , const nodemask_t * nodes )
196
196
{
197
197
if (nodes_empty (* nodes ))
198
198
return - EINVAL ;
@@ -210,22 +210,6 @@ static int mpol_new_preferred(struct mempolicy *pol, const nodemask_t *nodes)
210
210
return 0 ;
211
211
}
212
212
213
- static int mpol_new_preferred_many (struct mempolicy * pol , const nodemask_t * nodes )
214
- {
215
- if (nodes_empty (* nodes ))
216
- return - EINVAL ;
217
- pol -> nodes = * nodes ;
218
- return 0 ;
219
- }
220
-
221
- static int mpol_new_bind (struct mempolicy * pol , const nodemask_t * nodes )
222
- {
223
- if (nodes_empty (* nodes ))
224
- return - EINVAL ;
225
- pol -> nodes = * nodes ;
226
- return 0 ;
227
- }
228
-
229
213
/*
230
214
* mpol_set_nodemask is called after mpol_new() to set up the nodemask, if
231
215
* any, for the new policy. mpol_new() has already validated the nodes
@@ -405,22 +389,22 @@ static const struct mempolicy_operations mpol_ops[MPOL_MAX] = {
405
389
.rebind = mpol_rebind_default ,
406
390
},
407
391
[MPOL_INTERLEAVE ] = {
408
- .create = mpol_new_interleave ,
392
+ .create = mpol_new_nodemask ,
409
393
.rebind = mpol_rebind_nodemask ,
410
394
},
411
395
[MPOL_PREFERRED ] = {
412
396
.create = mpol_new_preferred ,
413
397
.rebind = mpol_rebind_preferred ,
414
398
},
415
399
[MPOL_BIND ] = {
416
- .create = mpol_new_bind ,
400
+ .create = mpol_new_nodemask ,
417
401
.rebind = mpol_rebind_nodemask ,
418
402
},
419
403
[MPOL_LOCAL ] = {
420
404
.rebind = mpol_rebind_default ,
421
405
},
422
406
[MPOL_PREFERRED_MANY ] = {
423
- .create = mpol_new_preferred_many ,
407
+ .create = mpol_new_nodemask ,
424
408
.rebind = mpol_rebind_preferred ,
425
409
},
426
410
};
0 commit comments