From owner-freebsd-audit@FreeBSD.ORG Thu Mar 24 18:09:04 2005 Return-Path: Delivered-To: freebsd-audit@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0A6F616A4CE for ; Thu, 24 Mar 2005 18:09:04 +0000 (GMT) Received: from tarsier.geekcn.org (tarsier.geekcn.org [210.51.165.229]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2858143D46 for ; Thu, 24 Mar 2005 18:09:01 +0000 (GMT) (envelope-from delphij@frontfree.net) Received: from beastie.frontfree.net (unknown [219.239.99.7]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tarsier.geekcn.org (Postfix) with ESMTP id E91C2EB15DF for ; Fri, 25 Mar 2005 02:08:58 +0800 (CST) Received: from localhost (localhost.frontfree.net [127.0.0.1]) by beastie.frontfree.net (Postfix) with ESMTP id EB71A136E4B for ; Fri, 25 Mar 2005 02:08:55 +0800 (CST) Received: from beastie.frontfree.net ([127.0.0.1]) by localhost (beastie.frontfree.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 26120-07 for ; Fri, 25 Mar 2005 02:08:45 +0800 (CST) Received: by beastie.frontfree.net (Postfix, from userid 1001) id 4867A136D58; Fri, 25 Mar 2005 02:08:45 +0800 (CST) Date: Fri, 25 Mar 2005 02:08:45 +0800 From: Xin LI To: freebsd-audit@FreeBSD.org Message-ID: <20050324180845.GA26524@frontfree.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="eAbsdosE1cNLO4uF" Content-Disposition: inline User-Agent: Mutt/1.4.2.1i X-GPG-key-ID/Fingerprint: 0xCAEEB8C0 / 43B8 B703 B8DD 0231 B333 DC28 39FB 93A0 CAEE B8C0 X-GPG-Public-Key: http://www.delphij.net/delphij.asc X-Operating-System: FreeBSD beastie.frontfree.net 5.3-RELEASE-p2 FreeBSD 5.3-RELEASE-p2 #15: Wed Dec 15 10:43:16 CST 2004 delphij@beastie.frontfree.net:/usr/obj/usr/src/sys/BEASTIE i386 X-URL: http://www.delphij.net X-By: delphij@beastie.frontfree.net X-Location: Beijing, China X-Virus-Scanned: by amavisd-new at frontfree.net Subject: [PATCH] nfsserver patch for review X-BeenThere: freebsd-audit@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: FreeBSD Security Audit List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Mar 2005 18:09:04 -0000 --eAbsdosE1cNLO4uF Content-Type: multipart/mixed; boundary="J/dobhs11T7y2rNN" Content-Disposition: inline --J/dobhs11T7y2rNN Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable =46rom NetBSD: For nfs3 requests, don't gather writes since it's clients' responsibility. Will anyone object if I will commit this against -CURRENT? Thanks in advance! Cheers, --=20 Xin LI http://www.delphij.net/ See complete headers for GPG key and other information. --J/dobhs11T7y2rNN Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-nfs Index: nfs_syscalls.c =================================================================== RCS file: /home/fcvs/src/sys/nfsserver/nfs_syscalls.c,v retrieving revision 1.102 diff -u -r1.102 nfs_syscalls.c --- nfs_syscalls.c 7 Jan 2005 01:45:51 -0000 1.102 +++ nfs_syscalls.c 24 Mar 2005 17:59:37 -0000 @@ -463,7 +463,8 @@ procrastinate = nfsrvw_procrastinate_v3; else procrastinate = nfsrvw_procrastinate; - if (writes_todo || (nd->nd_procnum == NFSPROC_WRITE && + if (writes_todo || (!(nd->nd_flag & ND_NFSV3) && + nd->nd_procnum == NFSPROC_WRITE && procrastinate > 0 && !notstarted)) error = nfsrv_writegather(&nd, slp, nfsd->nfsd_td, &mreq); --J/dobhs11T7y2rNN-- --eAbsdosE1cNLO4uF Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (FreeBSD) iD8DBQFCQwIt/cVsHxFZiIoRArz3AJ42DY98bCgCcxDvtwJHaKbD0yPK1QCfX30y 2xOD1Soe1H3m5l36vkL1BPc= =RDBV -----END PGP SIGNATURE----- --eAbsdosE1cNLO4uF--