From owner-cvs-src-old@FreeBSD.ORG  Sat Jan 16 12:16:49 2010
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 24F9B1065672
	for <cvs-src-old@freebsd.org>; Sat, 16 Jan 2010 12:16:49 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 12A5B8FC0C
	for <cvs-src-old@freebsd.org>; Sat, 16 Jan 2010 12:16:49 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0GCGmM5040243
	for <cvs-src-old@freebsd.org>; Sat, 16 Jan 2010 12:16:48 GMT
	(envelope-from marius@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0GCGmFH040242
	for cvs-src-old@freebsd.org; Sat, 16 Jan 2010 12:16:48 GMT
	(envelope-from marius@repoman.freebsd.org)
Message-Id: <201001161216.o0GCGmFH040242@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	marius@repoman.freebsd.org using -f
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 16 Jan 2010 12:16:38 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_8
Subject: cvs commit: src/sys/nfsserver nfs.h nfs_fha.c nfs_srvkrpc.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Jan 2010 12:16:49 -0000

marius      2010-01-16 12:16:38 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_8)
    sys/nfsserver        nfs.h nfs_fha.c nfs_srvkrpc.c 
  Log:
  SVN rev 202438 on 2010-01-16 12:16:38Z by marius
  
  MFC: r201896
  
  As nfsm_srvmtofh_xx() assumes the 4-byte alignment required by XDR
  ensure the mbuf data is aligned accordingly by calling nfs_realign()
  in fha_extract_info(). This fix is orthogonal to the problem solved
  by r199274/r199284 (MFC'ed to stable/8 in r199733).
  
  PR:             142102 (second part)
  
  Revision  Changes    Path
  1.90.2.2  +1 -0      src/sys/nfsserver/nfs.h
  1.4.2.3   +6 -2      src/sys/nfsserver/nfs_fha.c
  1.12.2.2  +1 -1      src/sys/nfsserver/nfs_srvkrpc.c