From patchwork Tue Mar 22 22:09:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 653651 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2MM94Qm019398 for ; Tue, 22 Mar 2011 22:09:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755563Ab1CVWJM (ORCPT ); Tue, 22 Mar 2011 18:09:12 -0400 Received: from mail-iy0-f174.google.com ([209.85.210.174]:49542 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755416Ab1CVWJL (ORCPT ); Tue, 22 Mar 2011 18:09:11 -0400 Received: by iyb26 with SMTP id 26so7900353iyb.19 for ; Tue, 22 Mar 2011 15:09:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:subject:to:date:message-id :in-reply-to:references:user-agent:mime-version:content-type :content-transfer-encoding; bh=PMypm3N7ZOvf2/ruxG3zB+ANQANeXLbk4avEQ33cxBo=; b=bzoMvfV7AEolUcsKEX85596rHHS2Hj7j3iq/yqMrTI271sd4z5Ckdq3pZvaV9soFCY m087DGRLpiF5swwQaOc7NxqE1ImwtVT/4QryCgVvo0p/dirKIkLkweuA9KW9OAmX+WOd Qudzy8gJmtqdbHk9iZxwYEvnoffrgVQl19hGc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:subject:to:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; b=bde4x0Wp46eAvjkJ+0HxRC3eTCD+rhfvpWI0ZUOA/RHWISulMJDS882ouvzhZqn1qw hEXwBwvvqXWPIiPJh0kfv+ZTDOloLISS7PsPv4A4/JpnBuAp8gwv+Q7mDgvgzD5SFn4w X66gUeZFa7gGljE2N7R81pmCEtJ2o/Q5XghBk= Received: by 10.231.54.100 with SMTP id p36mr5894607ibg.162.1300831750951; Tue, 22 Mar 2011 15:09:10 -0700 (PDT) Received: from matisse.1015granger.net ([99.26.161.222]) by mx.google.com with ESMTPS id gy41sm3493488ibb.5.2011.03.22.15.09.09 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 22 Mar 2011 15:09:09 -0700 (PDT) From: Chuck Lever Subject: [PATCH 1/4] SUNRPC: Clean up use of curly braces in switch cases To: linux-nfs@vger.kernel.org Date: Tue, 22 Mar 2011 18:09:08 -0400 Message-ID: <20110322220907.4360.79821.stgit@matisse.1015granger.net> In-Reply-To: <20110322220518.4360.51304.stgit@matisse.1015granger.net> References: <20110322220518.4360.51304.stgit@matisse.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 22 Mar 2011 22:09:13 +0000 (UTC) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 6111ea2..3725c6d 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -305,22 +305,21 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args) * up a string representation of the passed-in address. */ if (xprtargs.servername == NULL) { + struct sockaddr_in *sin = + (struct sockaddr_in *)args->address; + struct sockaddr_in6 *sin6 = + (struct sockaddr_in6 *)args->address; + servername[0] = '\0'; switch (args->address->sa_family) { - case AF_INET: { - struct sockaddr_in *sin = - (struct sockaddr_in *)args->address; + case AF_INET: snprintf(servername, sizeof(servername), "%pI4", &sin->sin_addr.s_addr); break; - } - case AF_INET6: { - struct sockaddr_in6 *sin = - (struct sockaddr_in6 *)args->address; + case AF_INET6: snprintf(servername, sizeof(servername), "%pI6", - &sin->sin6_addr); + &sin6->sin6_addr); break; - } default: /* caller wants default server name, but * address family isn't recognized. */