trace: replace strict_strto* with kstrto*

PATCH In review Daniel Walter 2 participants 3 messages Sep 26, 2012 – Nov 14, 2012

Subsystems (2)

Tracing ftrace

lore

Share & tools

lore

Daniel Walter

author

2012-09-26 20:08 UTC #0 lore raw

PATCH 1/1 trace: replace strict_strto* with kstrto*

[trace] replace strict_strto* with kstrto*

* remove old string conversions with kstrto*

Signed-off-by Daniel Walter <[email protected]>

---
 kernel/trace/ftrace.c              |    2 +-
 kernel/trace/trace.c               |    2 +-
 kernel/trace/trace_events_filter.c |    4 ++--
 kernel/trace/trace_functions.c     |    2 +-
 kernel/trace/trace_kprobe.c        |    2 +-
 kernel/trace/trace_probe.c         |   14 +++++++-------
 kernel/trace/trace_uprobe.c        |    2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

---

kernel/trace/ftrace.c +1 -1

index b4f20fb..5c1f213 100644
@@ -4215,7 +4215,7 @@ ftrace_pid_write(struct file *filp, const char __user *ubuf,
 	if (strlen(tmp) == 0)
 		return 1;
 
-	ret = strict_strtol(tmp, 10, &val);
+	ret = kstrtol(tmp, 10, &val);
 	if (ret < 0)
 		return ret;

kernel/trace/trace.c +1 -1

index 5c38c81..807cb78 100644
@@ -431,7 +431,7 @@ static int __init set_tracing_thresh(char *str)
 
 	if (!str)
 		return 0;
-	ret = strict_strtoul(str, 0, &threshhold);
+	ret = kstrtoul(str, 0, &threshhold);
 	if (ret < 0)
 		return 0;
 	tracing_thresh = threshhold * 1000;

kernel/trace/trace_events_filter.c +2 -2

index 431dba8..2a6440f 100644
@@ -1000,9 +1000,9 @@ static int init_pred(struct filter_parse_state *ps,
 		}
 	} else {
 		if (field->is_signed)
-			ret = strict_strtoll(pred->regex.pattern, 0, &val);
+			ret = kstrtoll(pred->regex.pattern, 0, &val);
 		else
-			ret = strict_strtoull(pred->regex.pattern, 0, &val);
+			ret = kstrtoull(pred->regex.pattern, 0, &val);
 		if (ret) {
 			parse_error(ps, FILT_ERR_ILLEGAL_INTVAL, 0);
 			return -EINVAL;

kernel/trace/trace_functions.c +1 -1

index a426f41..6e2be2d 100644
@@ -375,7 +375,7 @@ ftrace_trace_onoff_callback(struct ftrace_hash *hash,
 	 * We use the callback data field (which is a pointer)
 	 * as our counter.
 	 */
-	ret = strict_strtoul(number, 0, (unsigned long *)&count);
+	ret = kstrtoul(number, 0, (unsigned long *)&count);
 	if (ret)
 		return ret;

kernel/trace/trace_kprobe.c +1 -1

index 1a21170..5a3c533 100644
@@ -444,7 +444,7 @@ static int create_trace_probe(int argc, char **argv)
 			return -EINVAL;
 		}
 		/* an address specified */
-		ret = strict_strtoul(&argv[1][0], 0, (unsigned long *)&addr);
+		ret = kstrtoul(&argv[1][0], 0, (unsigned long *)&addr);
 		if (ret) {
 			pr_info("Failed to parse address.\n");
 			return ret;

kernel/trace/trace_probe.c +7 -7

index daa9980..412e959 100644
@@ -441,7 +441,7 @@ static const struct fetch_type *find_fetch_type(const char *type)
 			goto fail;
 
 		type++;
-		if (strict_strtoul(type, 0, &bs))
+		if (kstrtoul(type, 0, &bs))
 			goto fail;
 
 		switch (bs) {

@@ -501,8 +501,8 @@ int traceprobe_split_symbol_offset(char *symbol, unsigned long *offset)
 
 	tmp = strchr(symbol, '+');
 	if (tmp) {
-		/* skip sign because strict_strtol doesn't accept '+' */
-		ret = strict_strtoul(tmp + 1, 0, offset);
+		/* skip sign because kstrtoul doesn't accept '+' */
+		ret = kstrtoul(tmp + 1, 0, offset);
 		if (ret)
 			return ret;

@@ -533,7 +533,7 @@ static int parse_probe_vars(char *arg, const struct fetch_type *t,
 			else
 				ret = -EINVAL;
 		} else if (isdigit(arg[5])) {
-			ret = strict_strtoul(arg + 5, 10, &param);
+			ret = kstrtoul(arg + 5, 10, &param);
 			if (ret || param > PARAM_MAX_STACK)
 				ret = -EINVAL;
 			else {

@@ -579,7 +579,7 @@ static int parse_probe_arg(char *arg, const struct fetch_type *t,
 
 	case '@':	/* memory or symbol */
 		if (isdigit(arg[1])) {
-			ret = strict_strtoul(arg + 1, 0, &param);
+			ret = kstrtoul(arg + 1, 0, &param);
 			if (ret)
 				break;

@@ -597,14 +597,14 @@ static int parse_probe_arg(char *arg, const struct fetch_type *t,
 		break;
 
 	case '+':	/* deref memory */
-		arg++;	/* Skip '+', because strict_strtol() rejects it. */
+		arg++;	/* Skip '+', because kstrtol() rejects it. */
 	case '-':
 		tmp = strchr(arg, '(');
 		if (!tmp)
 			break;
 
 		*tmp = '\0';
-		ret = strict_strtol(arg, 0, &offset);
+		ret = kstrtol(arg, 0, &offset);
 
 		if (ret)
 			break;

kernel/trace/trace_uprobe.c +1 -1

index 03003cd..4ff9ca4 100644
@@ -252,7 +252,7 @@ static int create_trace_uprobe(int argc, char **argv)
 	if (ret)
 		goto fail_address_parse;
 
-	ret = strict_strtoul(arg, 0, &offset);
+	ret = kstrtoul(arg, 0, &offset);
 	if (ret)
 		goto fail_address_parse;

Steven Rostedt

maintainer

2012-09-26 20:19 UTC #1 lore raw

Quoted 5 lines · Daniel Walter

[trace] replace strict_strto* with kstrto*
* remove old string conversions with kstrto*
Signed-off-by Daniel Walter <[email protected]>

Thanks! I'll queue it up.

-- Steve

tip-bot for Daniel Walter

author

2012-11-14 06:42 UTC #2 lore raw

[tip:perf/core] tracing: Replace strict_strto* with kstrto*

In reply to Daniel Walter

Commit-ID:  bcd83ea6cbfee54e33d1527b87538dc99ca2137b
Gitweb:     http://git.kernel.org/tip/bcd83ea6cbfee54e33d1527b87538dc99ca2137b
Author:     Daniel Walter <[email protected]>
AuthorDate: Wed, 26 Sep 2012 22:08:38 +0200
Committer:  Steven Rostedt <[email protected]>
CommitDate: Wed, 31 Oct 2012 16:45:23 -0400

tracing: Replace strict_strto* with kstrto*