diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-07-19 03:20:15 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2013-08-09 10:59:01 -0400 |
commit | d3dbd93db54f477e066926394e3e4ae3ac06cd3b (patch) | |
tree | 2ff86b79dd972dedfb32c0ef216354eb18e219ce /drivers/xen | |
parent | 5f338d9001094a56cf87bd8a280b4e7ff953bb59 (diff) |
xen: replace strict_strtoul() with kstrtoul()
The usage of strict_strtoul() is not preferred, because
strict_strtoul() is obsolete. Thus, kstrtoul() should be
used.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r-- | drivers/xen/xen-selfballoon.c | 54 |
1 files changed, 36 insertions, 18 deletions
diff --git a/drivers/xen/xen-selfballoon.c b/drivers/xen/xen-selfballoon.c index 02817a85f877..21e18c18c7a1 100644 --- a/drivers/xen/xen-selfballoon.c +++ b/drivers/xen/xen-selfballoon.c | |||
@@ -265,8 +265,10 @@ static ssize_t store_selfballooning(struct device *dev, | |||
265 | if (!capable(CAP_SYS_ADMIN)) | 265 | if (!capable(CAP_SYS_ADMIN)) |
266 | return -EPERM; | 266 | return -EPERM; |
267 | 267 | ||
268 | err = strict_strtoul(buf, 10, &tmp); | 268 | err = kstrtoul(buf, 10, &tmp); |
269 | if (err || ((tmp != 0) && (tmp != 1))) | 269 | if (err) |
270 | return err; | ||
271 | if ((tmp != 0) && (tmp != 1)) | ||
270 | return -EINVAL; | 272 | return -EINVAL; |
271 | 273 | ||
272 | xen_selfballooning_enabled = !!tmp; | 274 | xen_selfballooning_enabled = !!tmp; |
@@ -292,8 +294,10 @@ static ssize_t store_selfballoon_interval(struct device *dev, | |||
292 | 294 | ||
293 | if (!capable(CAP_SYS_ADMIN)) | 295 | if (!capable(CAP_SYS_ADMIN)) |
294 | return -EPERM; | 296 | return -EPERM; |
295 | err = strict_strtoul(buf, 10, &val); | 297 | err = kstrtoul(buf, 10, &val); |
296 | if (err || val == 0) | 298 | if (err) |
299 | return err; | ||
300 | if (val == 0) | ||
297 | return -EINVAL; | 301 | return -EINVAL; |
298 | selfballoon_interval = val; | 302 | selfballoon_interval = val; |
299 | return count; | 303 | return count; |
@@ -314,8 +318,10 @@ static ssize_t store_selfballoon_downhys(struct device *dev, | |||
314 | 318 | ||
315 | if (!capable(CAP_SYS_ADMIN)) | 319 | if (!capable(CAP_SYS_ADMIN)) |
316 | return -EPERM; | 320 | return -EPERM; |
317 | err = strict_strtoul(buf, 10, &val); | 321 | err = kstrtoul(buf, 10, &val); |
318 | if (err || val == 0) | 322 | if (err) |
323 | return err; | ||
324 | if (val == 0) | ||
319 | return -EINVAL; | 325 | return -EINVAL; |
320 | selfballoon_downhysteresis = val; | 326 | selfballoon_downhysteresis = val; |
321 | return count; | 327 | return count; |
@@ -337,8 +343,10 @@ static ssize_t store_selfballoon_uphys(struct device *dev, | |||
337 | 343 | ||
338 | if (!capable(CAP_SYS_ADMIN)) | 344 | if (!capable(CAP_SYS_ADMIN)) |
339 | return -EPERM; | 345 | return -EPERM; |
340 | err = strict_strtoul(buf, 10, &val); | 346 | err = kstrtoul(buf, 10, &val); |
341 | if (err || val == 0) | 347 | if (err) |
348 | return err; | ||
349 | if (val == 0) | ||
342 | return -EINVAL; | 350 | return -EINVAL; |
343 | selfballoon_uphysteresis = val; | 351 | selfballoon_uphysteresis = val; |
344 | return count; | 352 | return count; |
@@ -360,8 +368,10 @@ static ssize_t store_selfballoon_min_usable_mb(struct device *dev, | |||
360 | 368 | ||
361 | if (!capable(CAP_SYS_ADMIN)) | 369 | if (!capable(CAP_SYS_ADMIN)) |
362 | return -EPERM; | 370 | return -EPERM; |
363 | err = strict_strtoul(buf, 10, &val); | 371 | err = kstrtoul(buf, 10, &val); |
364 | if (err || val == 0) | 372 | if (err) |
373 | return err; | ||
374 | if (val == 0) | ||
365 | return -EINVAL; | 375 | return -EINVAL; |
366 | selfballoon_min_usable_mb = val; | 376 | selfballoon_min_usable_mb = val; |
367 | return count; | 377 | return count; |
@@ -384,8 +394,10 @@ static ssize_t store_selfballoon_reserved_mb(struct device *dev, | |||
384 | 394 | ||
385 | if (!capable(CAP_SYS_ADMIN)) | 395 | if (!capable(CAP_SYS_ADMIN)) |
386 | return -EPERM; | 396 | return -EPERM; |
387 | err = strict_strtoul(buf, 10, &val); | 397 | err = kstrtoul(buf, 10, &val); |
388 | if (err || val == 0) | 398 | if (err) |
399 | return err; | ||
400 | if (val == 0) | ||
389 | return -EINVAL; | 401 | return -EINVAL; |
390 | selfballoon_reserved_mb = val; | 402 | selfballoon_reserved_mb = val; |
391 | return count; | 403 | return count; |
@@ -410,8 +422,10 @@ static ssize_t store_frontswap_selfshrinking(struct device *dev, | |||
410 | 422 | ||
411 | if (!capable(CAP_SYS_ADMIN)) | 423 | if (!capable(CAP_SYS_ADMIN)) |
412 | return -EPERM; | 424 | return -EPERM; |
413 | err = strict_strtoul(buf, 10, &tmp); | 425 | err = kstrtoul(buf, 10, &tmp); |
414 | if (err || ((tmp != 0) && (tmp != 1))) | 426 | if (err) |
427 | return err; | ||
428 | if ((tmp != 0) && (tmp != 1)) | ||
415 | return -EINVAL; | 429 | return -EINVAL; |
416 | frontswap_selfshrinking = !!tmp; | 430 | frontswap_selfshrinking = !!tmp; |
417 | if (!was_enabled && !xen_selfballooning_enabled && | 431 | if (!was_enabled && !xen_selfballooning_enabled && |
@@ -437,8 +451,10 @@ static ssize_t store_frontswap_inertia(struct device *dev, | |||
437 | 451 | ||
438 | if (!capable(CAP_SYS_ADMIN)) | 452 | if (!capable(CAP_SYS_ADMIN)) |
439 | return -EPERM; | 453 | return -EPERM; |
440 | err = strict_strtoul(buf, 10, &val); | 454 | err = kstrtoul(buf, 10, &val); |
441 | if (err || val == 0) | 455 | if (err) |
456 | return err; | ||
457 | if (val == 0) | ||
442 | return -EINVAL; | 458 | return -EINVAL; |
443 | frontswap_inertia = val; | 459 | frontswap_inertia = val; |
444 | frontswap_inertia_counter = val; | 460 | frontswap_inertia_counter = val; |
@@ -460,8 +476,10 @@ static ssize_t store_frontswap_hysteresis(struct device *dev, | |||
460 | 476 | ||
461 | if (!capable(CAP_SYS_ADMIN)) | 477 | if (!capable(CAP_SYS_ADMIN)) |
462 | return -EPERM; | 478 | return -EPERM; |
463 | err = strict_strtoul(buf, 10, &val); | 479 | err = kstrtoul(buf, 10, &val); |
464 | if (err || val == 0) | 480 | if (err) |
481 | return err; | ||
482 | if (val == 0) | ||
465 | return -EINVAL; | 483 | return -EINVAL; |
466 | frontswap_hysteresis = val; | 484 | frontswap_hysteresis = val; |
467 | return count; | 485 | return count; |