From patchwork Mon Mar 7 18:08:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 616311 X-Patchwork-Delegate: Trond.Myklebust@netapp.com 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 p27I8Mjt009125 for ; Mon, 7 Mar 2011 18:08:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751871Ab1CGSIV (ORCPT ); Mon, 7 Mar 2011 13:08:21 -0500 Received: from mail-iw0-f174.google.com ([209.85.214.174]:39184 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752565Ab1CGSIV (ORCPT ); Mon, 7 Mar 2011 13:08:21 -0500 Received: by iwn34 with SMTP id 34so4136355iwn.19 for ; Mon, 07 Mar 2011 10:08:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:subject:to:cc:date:message-id :user-agent:mime-version:content-type:content-transfer-encoding; bh=iwn8bCmEAtqkYf/QvGzr7xFKLE3H++bCh3Hw4WiYN94=; b=nESqSyt0YkflInDMFq6y0orAJm98LPy7kqNBnYAqB+jIaZWyux4l1u2sIiOOL/AU3C j7fKoCUGSn6rGf2ECP//cfhUoqB/j2QvAgYQXwq/26Vh0PCXe3HjEEWErBoSI5LYVXqr fqaFkADn8PYcWH2zDKobl3B9bx++1cNt1DyEk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:subject:to:cc:date:message-id:user-agent:mime-version :content-type:content-transfer-encoding; b=bRhsysdQgLsG7qBdl23iHbhp7bGzVmuI6En03CqiV9rg2M+trTbUFHlCgFXBbC6CSS Lane1bW2jn7mb8LvwHE7bOKwdjTA49Ao5Cg4+KW3iU6R6DMO8RgiypNKntjX11hxDk5n NjYEEz2kPsckfiQQzu2lnEL7JVjm2wx1iUWlc= Received: by 10.231.200.86 with SMTP id ev22mr3176522ibb.159.1299521300384; Mon, 07 Mar 2011 10:08:20 -0800 (PST) Received: from matisse.1015granger.net (adsl-99-26-161-222.dsl.sfldmi.sbcglobal.net [99.26.161.222]) by mx.google.com with ESMTPS id u9sm2946498ibe.20.2011.03.07.10.08.17 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 07 Mar 2011 10:08:18 -0800 (PST) From: Chuck Lever Subject: [PATCH] NFS: NFSROOT should default to "proto=udp" To: trond.myklebust@netapp.com Cc: linux-nfs@vger.kernel.org Date: Mon, 07 Mar 2011 13:08:16 -0500 Message-ID: <20110307180716.2493.67087.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]); Mon, 07 Mar 2011 18:08:22 +0000 (UTC) diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c index 903908a..0bc654f 100644 --- a/fs/nfs/nfsroot.c +++ b/fs/nfs/nfsroot.c @@ -86,11 +86,14 @@ /* Default path we try to mount. "%s" gets replaced by our IP address */ #define NFS_ROOT "/tftpboot/%s" +/* Default NFSROOT mount options. */ +#define NFS_DEF_OPTIONS "udp" + /* Parameters passed from the kernel command line */ static char nfs_root_parms[256] __initdata = ""; /* Text-based mount options passed to super.c */ -static char nfs_root_options[256] __initdata = ""; +static char nfs_root_options[256] __initdata = NFS_DEF_OPTIONS; /* Address of NFS server */ static __be32 servaddr __initdata = htonl(INADDR_NONE); @@ -217,7 +220,7 @@ static int __init root_nfs_parse_options(char *incoming, char *exppath, */ static int __init root_nfs_data(char *cmdline) { - char addr_option[sizeof("nolock,addr=") + INET_ADDRSTRLEN + 1]; + char mand_options[sizeof("nolock,addr=") + INET_ADDRSTRLEN + 1]; int len, retval = -1; char *tmp = NULL; const size_t tmplen = sizeof(nfs_export_path); @@ -244,9 +247,9 @@ static int __init root_nfs_data(char *cmdline) * Append mandatory options for nfsroot so they override * what has come before */ - snprintf(addr_option, sizeof(addr_option), "nolock,addr=%pI4", + snprintf(mand_options, sizeof(mand_options), "nolock,addr=%pI4", &servaddr); - if (root_nfs_cat(nfs_root_options, addr_option, + if (root_nfs_cat(nfs_root_options, mand_options, sizeof(nfs_root_options))) goto out_optionstoolong;