From owner-svn-src-all@FreeBSD.ORG  Tue Mar 12 12:19:23 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 98C5A1BA;
 Tue, 12 Mar 2013 12:19:23 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8C77E1B3;
 Tue, 12 Mar 2013 12:19:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2CCJNQ6069790;
 Tue, 12 Mar 2013 12:19:23 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2CCJN5Z069789;
 Tue, 12 Mar 2013 12:19:23 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201303121219.r2CCJN5Z069789@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 12 Mar 2013 12:19:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248196 - head/sys/nfs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Mar 2013 12:19:23 -0000

Author: glebius
Date: Tue Mar 12 12:19:23 2013
New Revision: 248196
URL: http://svnweb.freebsd.org/changeset/base/248196

Log:
  Use m_get2() to get mbuf of appropriate size.
  
  Sponsored by:	Nginx, Inc.

Modified:
  head/sys/nfs/krpc_subr.c

Modified: head/sys/nfs/krpc_subr.c
==============================================================================
--- head/sys/nfs/krpc_subr.c	Tue Mar 12 12:17:19 2013	(r248195)
+++ head/sys/nfs/krpc_subr.c	Tue Mar 12 12:19:23 2013	(r248196)
@@ -459,9 +459,7 @@ xdr_string_encode(char *str, int len)
 	if (mlen > MCLBYTES)		/* If too big, we just can't do it. */
 		return (NULL);
 
-	m = m_get(M_WAITOK, MT_DATA);
-	if (mlen > MLEN)
-		MCLGET(m, M_WAITOK);
+	m = m_get2(M_WAITOK, MT_DATA, 0, mlen);
 	xs = mtod(m, struct xdr_string *);
 	m->m_len = mlen;
 	xs->len = txdr_unsigned(len);