Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 31 Jul 2017 20:41:45 +0000 (UTC)
From:      Kirk McKusick <mckusick@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r321816 - head/sys/ufs/ffs
Message-ID:  <201707312041.v6VKfjw7031279@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mckusick
Date: Mon Jul 31 20:41:45 2017
New Revision: 321816
URL: https://svnweb.freebsd.org/changeset/base/321816

Log:
  Avoid reading a snapshot block when it is already in the cache.
  Update the use of the B_CACHE flag (since the May 1999 commit
  that made it the correct test here).
  
  Reported by: Andreas Longwitz <longwitz@incore.de>
  Reviewed by: kib
  Tested by: Peter Holm
  MFC after: 1 week

Modified:
  head/sys/ufs/ffs/ffs_snapshot.c

Modified: head/sys/ufs/ffs/ffs_snapshot.c
==============================================================================
--- head/sys/ufs/ffs/ffs_snapshot.c	Mon Jul 31 20:28:26 2017	(r321815)
+++ head/sys/ufs/ffs/ffs_snapshot.c	Mon Jul 31 20:41:45 2017	(r321816)
@@ -1394,7 +1394,7 @@ indiracct_ufs2(snapvp, cancelvp, level, blkno, lbn, rl
 	 */
 	bp = getblk(cancelvp, lbn, fs->fs_bsize, 0, 0, 0);
 	bp->b_blkno = fsbtodb(fs, blkno);
-	if ((bp->b_flags & (B_DONE | B_DELWRI)) == 0 &&
+	if ((bp->b_flags & B_CACHE) == 0 &&
 	    (error = readblock(cancelvp, bp, fragstoblks(fs, blkno)))) {
 		brelse(bp);
 		return (error);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707312041.v6VKfjw7031279>