linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Sunrpc: Supports hexadecimal number for sysctl files of sunrpc debug
@ 2015-09-10 12:41 Kinglong Mee
  2015-09-11 21:23 ` J. Bruce Fields
  0 siblings, 1 reply; 7+ messages in thread
From: Kinglong Mee @ 2015-09-10 12:41 UTC (permalink / raw)
  To: Trond Myklebust, J. Bruce Fields; +Cc: linux-nfs@vger.kernel.org, kinglongmee

The sunrpc debug sysctl files only accept decimal number right now.
But all the XXXDBUG_XXX macros are defined as hexadecimal.
It is not easy to set or check an separate flag.

This patch let those files support accepting hexadecimal number,
(decimal number is also supported). Also, display it as hexadecimal.

Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
---
 net/sunrpc/sysctl.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c
index 887f018..8e85e6f 100644
--- a/net/sunrpc/sysctl.c
+++ b/net/sunrpc/sysctl.c
@@ -76,7 +76,7 @@ static int
 proc_dodebug(struct ctl_table *table, int write,
 				void __user *buffer, size_t *lenp, loff_t *ppos)
 {
-	char		tmpbuf[20], c, *s;
+	char		tmpbuf[20], c, *s = NULL;
 	char __user *p;
 	unsigned int	value;
 	size_t		left, len;
@@ -103,23 +103,27 @@ proc_dodebug(struct ctl_table *table, int write,
 			return -EFAULT;
 		tmpbuf[left] = '\0';
 
-		for (s = tmpbuf, value = 0; '0' <= *s && *s <= '9'; s++, left--)
-			value = 10 * value + (*s - '0');
-		if (*s && !isspace(*s))
-			return -EINVAL;
-		while (left && isspace(*s))
-			left--, s++;
+		if (tmpbuf[0] == '0' && tmpbuf[1] == 'x')
+			value = simple_strtol(tmpbuf, &s, 16);
+		else
+			value = simple_strtol(tmpbuf, &s, 0);
+		if (s) {
+			if (!isspace(*s))
+				return -EINVAL;
+			left -= (s - tmpbuf);
+			while (left && isspace(*s))
+				left--, s++;
+		} else
+			left = 0;
 		*(unsigned int *) table->data = value;
 		/* Display the RPC tasks on writing to rpc_debug */
 		if (strcmp(table->procname, "rpc_debug") == 0)
 			rpc_show_tasks(&init_net);
 	} else {
-		if (!access_ok(VERIFY_WRITE, buffer, left))
-			return -EFAULT;
-		len = sprintf(tmpbuf, "%d", *(unsigned int *) table->data);
+		len = sprintf(tmpbuf, "0x%04x", *(unsigned int *) table->data);
 		if (len > left)
 			len = left;
-		if (__copy_to_user(buffer, tmpbuf, len))
+		if (copy_to_user(buffer, tmpbuf, len))
 			return -EFAULT;
 		if ((left -= len) > 0) {
 			if (put_user('\n', (char __user *)buffer + len))
-- 
2.5.0


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2015-11-03 19:49 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-10 12:41 [PATCH] Sunrpc: Supports hexadecimal number for sysctl files of sunrpc debug Kinglong Mee
2015-09-11 21:23 ` J. Bruce Fields
2015-09-12  1:34   ` Kinglong Mee
2015-09-12  1:37     ` [PATCH v2] " Kinglong Mee
2015-11-03 17:38       ` Trond Myklebust
2015-11-03 19:32         ` J. Bruce Fields
2015-11-03 19:49           ` Trond Myklebust

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).