From owner-svn-src-all@FreeBSD.ORG Wed Feb 15 17:09:26 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB4C5106564A; Wed, 15 Feb 2012 17:09:26 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A94888FC17; Wed, 15 Feb 2012 17:09:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1FH9QpS071864; Wed, 15 Feb 2012 17:09:26 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1FH9QPC071861; Wed, 15 Feb 2012 17:09:26 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <201202151709.q1FH9QPC071861@svn.freebsd.org> From: Alan Cox Date: Wed, 15 Feb 2012 17:09:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231771 - in stable/8/sys: fs/nfsserver nfsserver X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Feb 2012 17:09:26 -0000 Author: alc Date: Wed Feb 15 17:09:26 2012 New Revision: 231771 URL: http://svn.freebsd.org/changeset/base/231771 Log: Partial merge of r218345: Unless "cnt" exceeded MAX_COMMIT_COUNT, nfsrv_commit() and nfsvno_fsync() were incorrectly calling vm_object_page_clean(). They were passing the length of the range rather than the ending offset of the range. Reviewed by: kib Modified: stable/8/sys/fs/nfsserver/nfs_nfsdport.c stable/8/sys/nfsserver/nfs_serv.c Modified: stable/8/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- stable/8/sys/fs/nfsserver/nfs_nfsdport.c Wed Feb 15 16:59:24 2012 (r231770) +++ stable/8/sys/fs/nfsserver/nfs_nfsdport.c Wed Feb 15 17:09:26 2012 (r231771) @@ -1293,7 +1293,8 @@ nfsvno_fsync(struct vnode *vp, u_int64_t if (vp->v_object && (vp->v_object->flags & OBJ_MIGHTBEDIRTY)) { VM_OBJECT_LOCK(vp->v_object); - vm_object_page_clean(vp->v_object, off / PAGE_SIZE, (cnt + PAGE_MASK) / PAGE_SIZE, OBJPC_SYNC); + vm_object_page_clean(vp->v_object, OFF_TO_IDX(off), + OFF_TO_IDX(off + cnt + PAGE_MASK), OBJPC_SYNC); VM_OBJECT_UNLOCK(vp->v_object); } Modified: stable/8/sys/nfsserver/nfs_serv.c ============================================================================== --- stable/8/sys/nfsserver/nfs_serv.c Wed Feb 15 16:59:24 2012 (r231770) +++ stable/8/sys/nfsserver/nfs_serv.c Wed Feb 15 17:09:26 2012 (r231771) @@ -3489,7 +3489,8 @@ nfsrv_commit(struct nfsrv_descript *nfsd if (vp->v_object && (vp->v_object->flags & OBJ_MIGHTBEDIRTY)) { VM_OBJECT_LOCK(vp->v_object); - vm_object_page_clean(vp->v_object, off / PAGE_SIZE, (cnt + PAGE_MASK) / PAGE_SIZE, OBJPC_SYNC); + vm_object_page_clean(vp->v_object, OFF_TO_IDX(off), + OFF_TO_IDX(off + cnt + PAGE_MASK), OBJPC_SYNC); VM_OBJECT_UNLOCK(vp->v_object); }