From owner-cvs-src@FreeBSD.ORG  Fri Jun 20 07:52:53 2003
Return-Path: <owner-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 E21F037B401; Fri, 20 Jun 2003 07:52:53 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 94A0543F75; Fri, 20 Jun 2003 07:52:53 -0700 (PDT)
	(envelope-from tjr@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5KEqr0U054898;
	Fri, 20 Jun 2003 07:52:53 -0700 (PDT)
	(envelope-from tjr@repoman.freebsd.org)
Received: (from tjr@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5KEqqh3054891;
	Fri, 20 Jun 2003 07:52:52 -0700 (PDT)
Message-Id: <200306201452.h5KEqqh3054891@repoman.freebsd.org>
From: "Tim J. Robbins" <tjr@FreeBSD.org>
Date: Fri, 20 Jun 2003 07:52:52 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/fs/ntfs ntfs_subr.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
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, 20 Jun 2003 14:52:54 -0000

tjr         2003/06/20 07:52:52 PDT

  FreeBSD src repository

  Modified files:
    sys/fs/ntfs          ntfs_subr.c 
  Log:
  Merge from NetBSD src/sys/ntfs/ntfs_subr.c 1.5 & 1.30 (jdolecek):
  - Avoid calling bread() with different sizes on the same blkno.
    Although the buffer cache is designed to handle differing size
    buffers, it erroneously tries to write the incorrectly-sized buffer
    buffer back to disk before reading the correctly-sized one, even
    when it's not dirty. This behaviour caused a panic for read-only
    NTFS mounts when INVARIANTS was enabled ("bundirty: buffer x still
    on queue y"), reported by NAKAJI Hiroyuki.
  - Fix a bug in the code handling holes: a variable was incremented
    instead of decremented, which could cause an infinite loop.
  
  Revision  Changes    Path
  1.30      +15 -1     src/sys/fs/ntfs/ntfs_subr.c