Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932525Ab0LERwe (ORCPT ); Sun, 5 Dec 2010 12:52:34 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:55965 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932264Ab0LERwR (ORCPT ); Sun, 5 Dec 2010 12:52:17 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=Mf3ukreqE1vVrnWaB9XWRL3sEwthXN/R63tiYMz2QdnIHQUKLUgtnobkwKFTND4uz/ zQg1QDPnLvfZdP7+JDyyCvuQfhvisrU4zZgUuGOoVPtnxAOWbov7R8LfwGqLNq8dJrD7 ULifa5HDQSZnr6tZ97k2U/BjwoqjKMqo50m8k= From: Alexey Dobriyan To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, Alexey Dobriyan Subject: [PATCH 45/45] kstrtox: convert net/ Date: Sun, 5 Dec 2010 19:49:42 +0200 Message-Id: <1291571382-2719-45-git-send-email-adobriyan@gmail.com> X-Mailer: git-send-email 1.7.2.2 In-Reply-To: <1291571382-2719-1-git-send-email-adobriyan@gmail.com> References: <1291571382-2719-1-git-send-email-adobriyan@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 8531 Lines: 283 Signed-off-by: Alexey Dobriyan --- net/bluetooth/hci_sysfs.c | 16 ++++++++-------- net/dns_resolver/dns_key.c | 5 +++-- net/mac80211/debugfs.c | 10 ++++------ net/rfkill/core.c | 11 +++++------ net/sunrpc/addr.c | 18 +++++++----------- net/sunrpc/auth.c | 6 +++--- net/sunrpc/xprtsock.c | 8 +++++--- 7 files changed, 35 insertions(+), 39 deletions(-) diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c index 5fce3d6..131ce95 100644 --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c @@ -277,9 +277,9 @@ static ssize_t show_idle_timeout(struct device *dev, struct device_attribute *at static ssize_t store_idle_timeout(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { struct hci_dev *hdev = dev_get_drvdata(dev); - unsigned long val; + u32 val; - if (strict_strtoul(buf, 0, &val) < 0) + if (kstrtou32(buf, 0, &val) < 0) return -EINVAL; if (val != 0 && (val < 500 || val > 3600000)) @@ -299,12 +299,12 @@ static ssize_t show_sniff_max_interval(struct device *dev, struct device_attribu static ssize_t store_sniff_max_interval(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { struct hci_dev *hdev = dev_get_drvdata(dev); - unsigned long val; + u16 val; - if (strict_strtoul(buf, 0, &val) < 0) + if (kstrtou16(buf, 0, &val) < 0) return -EINVAL; - if (val < 0x0002 || val > 0xFFFE || val % 2) + if (val == 0 || val % 2) return -EINVAL; if (val < hdev->sniff_min_interval) @@ -324,12 +324,12 @@ static ssize_t show_sniff_min_interval(struct device *dev, struct device_attribu static ssize_t store_sniff_min_interval(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { struct hci_dev *hdev = dev_get_drvdata(dev); - unsigned long val; + u16 val; - if (strict_strtoul(buf, 0, &val) < 0) + if (kstrtou16(buf, 0, &val) < 0) return -EINVAL; - if (val < 0x0002 || val > 0xFFFE || val % 2) + if (val == 0 || val % 2) return -EINVAL; if (val > hdev->sniff_max_interval) diff --git a/net/dns_resolver/dns_key.c b/net/dns_resolver/dns_key.c index 739435a..8cd5294 100644 --- a/net/dns_resolver/dns_key.c +++ b/net/dns_resolver/dns_key.c @@ -62,7 +62,6 @@ static int dns_resolver_instantiate(struct key *key, const void *_data, size_t datalen) { struct user_key_payload *upayload; - unsigned long derrno; int ret; size_t result_len = 0; const char *data = _data, *end, *opt; @@ -113,11 +112,13 @@ dns_resolver_instantiate(struct key *key, const void *_data, size_t datalen) * that's to be recorded as the result in this key */ if (opt_nlen == sizeof(DNS_ERRORNO_OPTION) - 1 && memcmp(opt, DNS_ERRORNO_OPTION, opt_nlen) == 0) { + unsigned long derrno; + kdebug("dns error number option"); if (opt_vlen <= 0) goto bad_option_value; - ret = strict_strtoul(eq, 10, &derrno); + ret = kstrtoul(eq, 10, &derrno); if (ret < 0) goto bad_option_value; diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c index 18260aa..149efdd 100644 --- a/net/mac80211/debugfs.c +++ b/net/mac80211/debugfs.c @@ -181,7 +181,7 @@ static ssize_t uapsd_queues_write(struct file *file, size_t count, loff_t *ppos) { struct ieee80211_local *local = file->private_data; - unsigned long val; + unsigned int val; char buf[10]; size_t len; int ret; @@ -191,8 +191,7 @@ static ssize_t uapsd_queues_write(struct file *file, return -EFAULT; buf[len] = '\0'; - ret = strict_strtoul(buf, 0, &val); - + ret = kstrtouint(buf, 0, &val); if (ret) return -EINVAL; @@ -228,7 +227,7 @@ static ssize_t uapsd_max_sp_len_write(struct file *file, size_t count, loff_t *ppos) { struct ieee80211_local *local = file->private_data; - unsigned long val; + unsigned int val; char buf[10]; size_t len; int ret; @@ -238,8 +237,7 @@ static ssize_t uapsd_max_sp_len_write(struct file *file, return -EFAULT; buf[len] = '\0'; - ret = strict_strtoul(buf, 0, &val); - + ret = kstrtouint(buf, 0, &val); if (ret) return -EINVAL; diff --git a/net/rfkill/core.c b/net/rfkill/core.c index 04f5990..fd55757 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c @@ -652,17 +652,16 @@ static ssize_t rfkill_soft_store(struct device *dev, const char *buf, size_t count) { struct rfkill *rfkill = to_rfkill(dev); - unsigned long state; + unsigned int state; int err; if (!capable(CAP_NET_ADMIN)) return -EPERM; - err = strict_strtoul(buf, 0, &state); + err = kstrtouint(buf, 0, &state); if (err) return err; - - if (state > 1 ) + if (state > 1) return -EINVAL; mutex_lock(&rfkill_global_mutex); @@ -696,13 +695,13 @@ static ssize_t rfkill_state_store(struct device *dev, const char *buf, size_t count) { struct rfkill *rfkill = to_rfkill(dev); - unsigned long state; + int state; int err; if (!capable(CAP_NET_ADMIN)) return -EPERM; - err = strict_strtoul(buf, 0, &state); + err = kstrtoint(buf, 0, &state); if (err) return err; diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c index 1419d0c..36c554c 100644 --- a/net/sunrpc/addr.c +++ b/net/sunrpc/addr.c @@ -173,15 +173,15 @@ static int rpc_parse_scope_id(const char *buf, const size_t buflen, len = (buf + buflen) - delim - 1; p = kstrndup(delim + 1, len, GFP_KERNEL); if (p) { - unsigned long scope_id = 0; struct net_device *dev; + u32 scope_id; dev = dev_get_by_name(&init_net, p); if (dev != NULL) { scope_id = dev->ifindex; dev_put(dev); } else { - if (strict_strtoul(p, 10, &scope_id) == 0) { + if (kstrtou32(p, 10, &scope_id) < 0) { kfree(p); return 0; } @@ -299,7 +299,7 @@ EXPORT_SYMBOL_GPL(rpc_sockaddr2uaddr); * @sap: buffer into which to plant socket address * @salen: size of buffer * - * @uaddr does not have to be '\0'-terminated, but strict_strtoul() and + * @uaddr does not have to be '\0'-terminated, but kstrto*() and * rpc_pton() require proper string termination to be successful. * * Returns the size of the socket address if successful; otherwise @@ -309,7 +309,7 @@ size_t rpc_uaddr2sockaddr(const char *uaddr, const size_t uaddr_len, struct sockaddr *sap, const size_t salen) { char *c, buf[RPCBIND_MAXUADDRLEN + sizeof('\0')]; - unsigned long portlo, porthi; + u8 portlo, porthi; unsigned short port; if (uaddr_len > RPCBIND_MAXUADDRLEN) @@ -321,21 +321,17 @@ size_t rpc_uaddr2sockaddr(const char *uaddr, const size_t uaddr_len, c = strrchr(buf, '.'); if (unlikely(c == NULL)) return 0; - if (unlikely(strict_strtoul(c + 1, 10, &portlo) != 0)) - return 0; - if (unlikely(portlo > 255)) + if (unlikely(kstrtou8(c + 1, 10, &portlo) != 0)) return 0; *c = '\0'; c = strrchr(buf, '.'); if (unlikely(c == NULL)) return 0; - if (unlikely(strict_strtoul(c + 1, 10, &porthi) != 0)) - return 0; - if (unlikely(porthi > 255)) + if (unlikely(kstrtou8(c + 1, 10, &porthi) != 0)) return 0; - port = (unsigned short)((porthi << 8) | portlo); + port = (porthi << 8) | portlo; *c = '\0'; if (rpc_pton(buf, strlen(buf), sap, salen) == 0) diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index afe6784..79737b2 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c @@ -47,9 +47,9 @@ static int param_set_hashtbl_sz(const char *val, const struct kernel_param *kp) if (!val) goto out_inval; - ret = strict_strtoul(val, 0, &num); - if (ret == -EINVAL) - goto out_inval; + ret = kstrtoul(val, 0, &num); + if (ret < 0) + return ret; nbits = fls(num); if (num > (1U << nbits)) nbits++; diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index dfcab5a..04d1496 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -2485,13 +2485,15 @@ static int param_set_uint_minmax(const char *val, const struct kernel_param *kp, unsigned int min, unsigned int max) { - unsigned long num; + unsigned int num; int ret; if (!val) return -EINVAL; - ret = strict_strtoul(val, 0, &num); - if (ret == -EINVAL || num < min || num > max) + ret = kstrtouint(val, 0, &num); + if (ret < 0) + return ret; + if (num < min || num > max) return -EINVAL; *((unsigned int *)kp->arg) = num; return 0; -- 1.7.2.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/