Re: [Cluster-devel] [RFC 1/1 linux-next] gfs2: convert simple_str to kstr

[Steven Whitehouse]

Hi,

On 29/04/15 19:54, Fabian Frederick wrote:

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

Basically it's an RFC because of the type mismatch all over the place.
ie code was doing simple_strtol to integer...
Newer kstr functions detect such problems.
By default I used destination type as a reference. Maybe it's wrong and we
really want to read long, unsigned long from source ?

Signed-off-by: Fabian Frederick <f...@skynet.be>

Looks correct to me. Most of those are simple 1 or 0 interfaces anyway.
Acked-by: Steven Whitehouse <swhit...@redhat.com>

Steve.

---
  fs/gfs2/sys.c | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
  1 file changed, 44 insertions(+), 12 deletions(-)

diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index ae8e881..436bdeb 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))
@@ -325,9 +350,11 @@ 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 val, error;

- val = simple_strtol(buf, NULL, 0);

+       error = kstrtoint(buf, 0, &val);
+       if (error)
+               return error;

if (val == 1)

                set_bit(DFL_BLOCK_LOCKS, &ls->ls_recover_flags);
@@ -351,9 +378,11 @@ 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 val, error;

- val = simple_strtol(buf, NULL, 0);

+       error = kstrtoint(buf, 0, &val);
+       if (error)
+               return error;

if ((val == 1) &&

            !strcmp(sdp->sd_lockstruct.ls_ops->lm_proto_name, "lock_dlm"))
@@ -553,11 +582,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;