From owner-cvs-src@FreeBSD.ORG  Fri Jun 10 08:45:59 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6897E16A41C;
	Fri, 10 Jun 2005 08:45:59 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 45A1343D48;
	Fri, 10 Jun 2005 08:45:59 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5A8jxVI031121;
	Fri, 10 Jun 2005 08:45:59 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5A8jxlj031120;
	Fri, 10 Jun 2005 08:45:59 GMT (envelope-from rwatson)
Message-Id: <200506100845.j5A8jxlj031120@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Fri, 10 Jun 2005 08:45:58 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_5
Cc: 
Subject: cvs commit: src/sys/nfsserver nfs.h nfs_serv.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jun 2005 08:45:59 -0000

rwatson     2005-06-10 08:45:58 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5)
    sys/nfsserver        nfs.h nfs_serv.c 
  Log:
  Merge nfs.h:1.78 and nfs_serv.c:1.156 from HEAD to RELENG_5:
  
    NFS write gathering defers execution of NFS server write requests to wait
    to see if additional write requests will arrive that can be coalesced and
    clustered with earlier ones.  When doing so, it must determine whether
    the two requests are made by credentials with the same access writes, so
    as not to coalesce improperly.  NFSW_SAMECRED() implements a test of two
    credentials using a binary compare.
  
    Replace NFSW_SAMECRED() macro with nfsrv_samecred() function, which is
    aware of the contents and layout of a struct ucred, rather than a simple
    binary compare.  While the binary compare works when ucred is simply a
    zero'd and embedded 'struct ucred' in the NFS descriptor, it will work
    less well when the ucred associated with an NFS descriptor is "real", so
    has defined and populated reference count, mutex, etc.
  
    Obtained from:  TrustedBSD Project
  
  Revision   Changes    Path
  1.75.2.2   +0 -4      src/sys/nfsserver/nfs.h
  1.147.2.5  +23 -1     src/sys/nfsserver/nfs_serv.c