From owner-cvs-src-old@FreeBSD.ORG Tue Feb 9 23:45:39 2010 Return-Path: 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 E50C51065670 for ; Tue, 9 Feb 2010 23:45:39 +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 D17888FC24 for ; Tue, 9 Feb 2010 23:45:39 +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 o19NjdLA092762 for ; Tue, 9 Feb 2010 23:45:39 GMT (envelope-from marius@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o19Njdtb092761 for cvs-src-old@freebsd.org; Tue, 9 Feb 2010 23:45:39 GMT (envelope-from marius@repoman.freebsd.org) Message-Id: <201002092345.o19Njdtb092761@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to marius@repoman.freebsd.org using -f From: Marius Strobl Date: Tue, 9 Feb 2010 23:45:14 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/nfs nfs_common.c nfs_common.h src/sys/nfsclient nfs_krpc.c 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Feb 2010 23:45:40 -0000 marius 2010-02-09 23:45:14 UTC FreeBSD src repository Modified files: sys/nfs nfs_common.c nfs_common.h sys/nfsclient nfs_krpc.c sys/nfsserver nfs.h nfs_fha.c nfs_srvkrpc.c Log: SVN rev 203732 on 2010-02-09 23:45:14Z by marius - Move nfs_realign() from the NFS client to the shared NFS code and remove the NFS server version in order to reduce code duplication. The shared version now uses a second parameter how, which is passed on to m_get(9) and m_getcl(9) as the server used M_WAIT while the client requires M_DONTWAIT, and replaces the the previously unused parameter hsiz. - Change nfs_realign() to use nfsm_aligned() so as with other NFS code the alignment check isn't actually performed on platforms without strict alignment requirements for performance reasons because as the comment suggests unaligned data only occasionally occurs with TCP. - Change fha_extract_info() to use nfs_realign() with M_DONTWAIT rather than M_WAIT because it's called with the RPC sp_lock held. Reviewed by: jhb, rmacklem MFC after: 1 week Revision Changes Path 1.124 +67 -0 src/sys/nfs/nfs_common.c 1.40 +1 -0 src/sys/nfs/nfs_common.h 1.11 +1 -66 src/sys/nfsclient/nfs_krpc.c 1.93 +0 -1 src/sys/nfsserver/nfs.h 1.9 +3 -1 src/sys/nfsserver/nfs_fha.c 1.15 +1 -58 src/sys/nfsserver/nfs_srvkrpc.c