gfs2: convert simple_str to kstr

-Remove obsolete simple_str functions.
-Return error code when kstr failed.
-This patch also calls functions corresponding to destination type.

Thanks to Alexey Dobriyan for suggesting improvements in
block_store() and wdack_store()

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>

1 files changed, 48 insertions, 18 deletions

diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index ae8e8811f0e8..c9ff1cf7d4f3 100644
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -101,8 +101,11 @@ static ssize_t freeze_show(struct gfs2_sbd *sdp, char *buf)
 
 static ssize_t freeze_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
 {
-        int error;
-        int n = simple_strtol(buf, NULL, 0);
+        int error, n;
+
+        error = kstrtoint(buf, 0, &n);
+        if (error)
+                return error;
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
@@ -134,10 +137,16 @@ static ssize_t withdraw_show(struct gfs2_sbd *sdp, char *buf)
 
 static ssize_t withdraw_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
 {
+        int error, val;
+
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        if (simple_strtol(buf, NULL, 0) != 1)
+        error = kstrtoint(buf, 0, &val);
+        if (error)
+                return error;
+
+        if (val != 1)
                 return -EINVAL;
 
         gfs2_lm_withdraw(sdp, "withdrawing from cluster at user's request\n");
@@ -148,10 +157,16 @@ static ssize_t withdraw_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
 static ssize_t statfs_sync_store(struct gfs2_sbd *sdp, const char *buf,
                                  size_t len)
 {
+        int error, val;
+
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        if (simple_strtol(buf, NULL, 0) != 1)
+        error = kstrtoint(buf, 0, &val);
+        if (error)
+                return error;
+
+        if (val != 1)
                 return -EINVAL;
 
         gfs2_statfs_sync(sdp->sd_vfs, 0);
@@ -161,10 +176,16 @@ static ssize_t statfs_sync_store(struct gfs2_sbd *sdp, const char *buf,
 static ssize_t quota_sync_store(struct gfs2_sbd *sdp, const char *buf,
                                 size_t len)
 {
+        int error, val;
+
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        if (simple_strtol(buf, NULL, 0) != 1)
+        error = kstrtoint(buf, 0, &val);
+        if (error)
+                return error;
+
+        if (val != 1)
                 return -EINVAL;
 
         gfs2_quota_sync(sdp->sd_vfs, 0);
@@ -181,7 +202,9 @@ static ssize_t quota_refresh_user_store(struct gfs2_sbd *sdp, const char *buf,
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        id = simple_strtoul(buf, NULL, 0);
+        error = kstrtou32(buf, 0, &id);
+        if (error)
+                return error;
 
         qid = make_kqid(current_user_ns(), USRQUOTA, id);
         if (!qid_valid(qid))
@@ -201,7 +224,9 @@ static ssize_t quota_refresh_group_store(struct gfs2_sbd *sdp, const char *buf,
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        id = simple_strtoul(buf, NULL, 0);
+        error = kstrtou32(buf, 0, &id);
+        if (error)
+                return error;
 
         qid = make_kqid(current_user_ns(), GRPQUOTA, id);
         if (!qid_valid(qid))
@@ -324,10 +349,11 @@ static ssize_t block_show(struct gfs2_sbd *sdp, char *buf)
 static ssize_t block_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
 {
         struct lm_lockstruct *ls = &sdp->sd_lockstruct;
-        ssize_t ret = len;
-        int val;
+        int ret, val;
 
-        val = simple_strtol(buf, NULL, 0);
+        ret = kstrtoint(buf, 0, &val);
+        if (ret)
+                return ret;
 
         if (val == 1)
                 set_bit(DFL_BLOCK_LOCKS, &ls->ls_recover_flags);
@@ -336,9 +362,9 @@ static ssize_t block_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
                 smp_mb__after_atomic();
                 gfs2_glock_thaw(sdp);
         } else {
-                ret = -EINVAL;
+                return -EINVAL;
         }
-        return ret;
+        return len;
 }
 
 static ssize_t wdack_show(struct gfs2_sbd *sdp, char *buf)
@@ -350,17 +376,18 @@ static ssize_t wdack_show(struct gfs2_sbd *sdp, char *buf)
 
 static ssize_t wdack_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
 {
-        ssize_t ret = len;
-        int val;
+        int ret, val;
 
-        val = simple_strtol(buf, NULL, 0);
+        ret = kstrtoint(buf, 0, &val);
+        if (ret)
+                return ret;
 
         if ((val == 1) &&
             !strcmp(sdp->sd_lockstruct.ls_ops->lm_proto_name, "lock_dlm"))
                 complete(&sdp->sd_wdack);
         else
-                ret = -EINVAL;
-        return ret;
+                return -EINVAL;
+        return len;
 }
 
 static ssize_t lkfirst_show(struct gfs2_sbd *sdp, char *buf)
@@ -553,11 +580,14 @@ static ssize_t tune_set(struct gfs2_sbd *sdp, unsigned int *field,
 {
         struct gfs2_tune *gt = &sdp->sd_tune;
         unsigned int x;
+        int error;
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
 
-        x = simple_strtoul(buf, NULL, 0);
+        error = kstrtouint(buf, 0, &x);
+        if (error)
+                return error;
 
         if (check_zero && !x)
                 return -EINVAL;