From patchwork Thu Sep 10 12:41:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 7153801 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AA6D29F326 for ; Thu, 10 Sep 2015 12:41:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BE44120925 for ; Thu, 10 Sep 2015 12:41:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD686208B2 for ; Thu, 10 Sep 2015 12:41:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753502AbbIJMlr (ORCPT ); Thu, 10 Sep 2015 08:41:47 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:36613 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752386AbbIJMlr (ORCPT ); Thu, 10 Sep 2015 08:41:47 -0400 Received: by padhk3 with SMTP id hk3so42346912pad.3 for ; Thu, 10 Sep 2015 05:41:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-type:content-transfer-encoding; bh=+b4SYmfQSd0/rCHYTsGtmyyxr3W213j/X+FnNAyrztY=; b=BuedJmk0z3+6AYoa7FuP8yvvQC235fXS9DlJI/Ok8jcR/hmlYXmKj7eSm187Kb5C6J txI1x6XW+R8wPd2pQ2+GcTu8+vWYcU9G0xcAse5DnMdhIxIehQiya6IbLRvdneseT/QO Ve58OBvZnPMRciMTKgG3CjrL+q2Go8ZUY7OmVN4xxGfE8VzLWOqphlKPP74YYeKMSd+H l9u7KxNIvgo3tSh2A2AY5pPV8tNF9UcrWtyrT6U3AZuZNYqpcb9yNlBZ8Q5Z/9ZTnSPr 22NKM6DW2ekw0uzlUgesaGPIGfulyXuhgYowbIokOYPcu/O/cgyXIxjuQE16+aUg4yTE Phyg== X-Received: by 10.66.191.131 with SMTP id gy3mr5068937pac.113.1441888906676; Thu, 10 Sep 2015 05:41:46 -0700 (PDT) Received: from [192.168.99.23] ([104.143.41.79]) by smtp.googlemail.com with ESMTPSA id rb8sm11903313pbb.63.2015.09.10.05.41.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Sep 2015 05:41:45 -0700 (PDT) To: Trond Myklebust , "J. Bruce Fields" Cc: "linux-nfs@vger.kernel.org" , kinglongmee@gmail.com From: Kinglong Mee Subject: [PATCH] Sunrpc: Supports hexadecimal number for sysctl files of sunrpc debug Message-ID: <55F17A7E.50406@gmail.com> Date: Thu, 10 Sep 2015 20:41:34 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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))