Merge tag 'nfs-for-3.12-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[cascardo/linux.git] / drivers / xen / xen-selfballoon.c

diff --git a/drivers/xen/xen-selfballoon.c b/drivers/xen/xen-selfballoon.c
index 02817a8..21e18c1 100644 (file)
--- a/drivers/xen/xen-selfballoon.c
+++ b/drivers/xen/xen-selfballoon.c
@@ -265,8 +265,10 @@ static ssize_t store_selfballooning(struct device *dev,
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
 
-       err = strict_strtoul(buf, 10, &tmp);
-       if (err || ((tmp != 0) && (tmp != 1)))
+       err = kstrtoul(buf, 10, &tmp);
+       if (err)
+               return err;
+       if ((tmp != 0) && (tmp != 1))
                return -EINVAL;
 
        xen_selfballooning_enabled = !!tmp;
@@ -292,8 +294,10 @@ static ssize_t store_selfballoon_interval(struct device *dev,
 
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
-       err = strict_strtoul(buf, 10, &val);
-       if (err || val == 0)
+       err = kstrtoul(buf, 10, &val);
+       if (err)
+               return err;
+       if (val == 0)
                return -EINVAL;
        selfballoon_interval = val;
        return count;
@@ -314,8 +318,10 @@ static ssize_t store_selfballoon_downhys(struct device *dev,
 
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
-       err = strict_strtoul(buf, 10, &val);
-       if (err || val == 0)
+       err = kstrtoul(buf, 10, &val);
+       if (err)
+               return err;
+       if (val == 0)
                return -EINVAL;
        selfballoon_downhysteresis = val;
        return count;
@@ -337,8 +343,10 @@ static ssize_t store_selfballoon_uphys(struct device *dev,
 
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
-       err = strict_strtoul(buf, 10, &val);
-       if (err || val == 0)
+       err = kstrtoul(buf, 10, &val);
+       if (err)
+               return err;
+       if (val == 0)
                return -EINVAL;
        selfballoon_uphysteresis = val;
        return count;
@@ -360,8 +368,10 @@ static ssize_t store_selfballoon_min_usable_mb(struct device *dev,
 
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
-       err = strict_strtoul(buf, 10, &val);
-       if (err || val == 0)
+       err = kstrtoul(buf, 10, &val);
+       if (err)
+               return err;
+       if (val == 0)
                return -EINVAL;
        selfballoon_min_usable_mb = val;
        return count;
@@ -384,8 +394,10 @@ static ssize_t store_selfballoon_reserved_mb(struct device *dev,
 
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
-       err = strict_strtoul(buf, 10, &val);
-       if (err || val == 0)
+       err = kstrtoul(buf, 10, &val);
+       if (err)
+               return err;
+       if (val == 0)
                return -EINVAL;
        selfballoon_reserved_mb = val;
        return count;
@@ -410,8 +422,10 @@ static ssize_t store_frontswap_selfshrinking(struct device *dev,
 
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
-       err = strict_strtoul(buf, 10, &tmp);
-       if (err || ((tmp != 0) && (tmp != 1)))
+       err = kstrtoul(buf, 10, &tmp);
+       if (err)
+               return err;
+       if ((tmp != 0) && (tmp != 1))
                return -EINVAL;
        frontswap_selfshrinking = !!tmp;
        if (!was_enabled && !xen_selfballooning_enabled &&
@@ -437,8 +451,10 @@ static ssize_t store_frontswap_inertia(struct device *dev,
 
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
-       err = strict_strtoul(buf, 10, &val);
-       if (err || val == 0)
+       err = kstrtoul(buf, 10, &val);
+       if (err)
+               return err;
+       if (val == 0)
                return -EINVAL;
        frontswap_inertia = val;
        frontswap_inertia_counter = val;
@@ -460,8 +476,10 @@ static ssize_t store_frontswap_hysteresis(struct device *dev,
 
        if (!capable(CAP_SYS_ADMIN))
                return -EPERM;
-       err = strict_strtoul(buf, 10, &val);
-       if (err || val == 0)
+       err = kstrtoul(buf, 10, &val);
+       if (err)
+               return err;
+       if (val == 0)
                return -EINVAL;
        frontswap_hysteresis = val;
        return count;