From patchwork Mon Dec 24 02:14:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 208001 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A0A252C0084 for ; Mon, 24 Dec 2012 13:16:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752841Ab2LXCPV (ORCPT ); Sun, 23 Dec 2012 21:15:21 -0500 Received: from mail-pb0-f50.google.com ([209.85.160.50]:61655 "EHLO mail-pb0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752924Ab2LXCPQ (ORCPT ); Sun, 23 Dec 2012 21:15:16 -0500 Received: by mail-pb0-f50.google.com with SMTP id wz7so3716861pbc.9 for ; Sun, 23 Dec 2012 18:15:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=eULEPYbCNd5hs6bPZW/xljIaRcqHgvG4RXGmbklKIoc=; b=oWlN1hbTH/XFX45xM+pSl177WPXJJzh0CmXRcU6B/DDhXGXyiGdzEjjTyM2RrR26Oo whsbzN4PdjaKYrQ9WU1opuQLRV2+dAhsW57QsiseChFHdVUHvhNuAOfWotZsl/iE9hIP VpMBDUdcPubnYlL7L/nmJWUimRaeb8lwrbN+muiZavq+ELCRQDuhSeJq6cFrY07I5Mgw nQl9pNrVpaFr59B9iT68raPeOVYkzl5DnU7TqlEvALLDpy1gCcaZEibT7R/YsuppDQvz sqaQccNW3oxo9kquZIWdyJj7XL8jDA2BIqUIu98bRWCFBWti+kTwxF8SjZcL55WfOTG7 bUMg== X-Received: by 10.68.138.195 with SMTP id qs3mr62367476pbb.62.1356315315704; Sun, 23 Dec 2012 18:15:15 -0800 (PST) Received: from localhost.localdomain (p2126-ipbf3106hodogaya.kanagawa.ocn.ne.jp. [114.149.157.126]) by mx.google.com with ESMTPS id wr4sm11379909pbc.72.2012.12.23.18.15.13 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 23 Dec 2012 18:15:15 -0800 (PST) From: Akinobu Mita To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org Cc: Akinobu Mita , "J. Bruce Fields" , Trond Myklebust , "David S. Miller" , netdev@vger.kernel.org, linux-nfs@vger.kernel.org Subject: [PATCH 21/29] net/sunrpc: rename random32() and net_random() to prandom_u32() Date: Mon, 24 Dec 2012 11:14:08 +0900 Message-Id: <1356315256-6572-22-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1356315256-6572-1-git-send-email-akinobu.mita@gmail.com> References: <1356315256-6572-1-git-send-email-akinobu.mita@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use more preferable function name which implies using a pseudo-random number generator. Signed-off-by: Akinobu Mita Cc: "J. Bruce Fields" Cc: Trond Myklebust Cc: "David S. Miller" Cc: netdev@vger.kernel.org Cc: linux-nfs@vger.kernel.org --- net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 ++-- net/sunrpc/cache.c | 2 +- net/sunrpc/xprt.c | 2 +- net/sunrpc/xprtsock.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/sunrpc/auth_gss/gss_krb5_wrap.c b/net/sunrpc/auth_gss/gss_krb5_wrap.c index 107c452..daf301f 100644 --- a/net/sunrpc/auth_gss/gss_krb5_wrap.c +++ b/net/sunrpc/auth_gss/gss_krb5_wrap.c @@ -130,8 +130,8 @@ gss_krb5_make_confounder(char *p, u32 conflen) /* initialize to random value */ if (i == 0) { - i = random32(); - i = (i << 32) | random32(); + i = prandom_u32(); + i = (i << 32) | prandom_u32(); } switch (conflen) { diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c index 9afa439..0f85674 100644 --- a/net/sunrpc/cache.c +++ b/net/sunrpc/cache.c @@ -629,7 +629,7 @@ static void cache_limit_defers(void) /* Consider removing either the first or the last */ if (cache_defer_cnt > DFR_MAX) { - if (net_random() & 1) + if (prandom_u32() & 1) discard = list_entry(cache_defer_list.next, struct cache_deferred_req, recent); else diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index bd462a5..0b51154 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -1109,7 +1109,7 @@ static inline __be32 xprt_alloc_xid(struct rpc_xprt *xprt) static inline void xprt_init_xid(struct rpc_xprt *xprt) { - xprt->xid = net_random(); + xprt->xid = prandom_u32(); } static void xprt_request_init(struct rpc_task *task, struct rpc_xprt *xprt) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 68b0a81..3b126ae 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -1654,7 +1654,7 @@ static void xs_udp_timer(struct rpc_task *task) static unsigned short xs_get_random_port(void) { unsigned short range = xprt_max_resvport - xprt_min_resvport; - unsigned short rand = (unsigned short) net_random() % range; + unsigned short rand = (unsigned short) prandom_u32() % range; return rand + xprt_min_resvport; }