svn commit: r304675 - releng/11.0/sys/ufs/ffs

[Konstantin Belousov]

Author: kib
Date: Tue Aug 23 12:22:35 2016
New Revision: 304675
URL: https://svnweb.freebsd.org/changeset/base/304675

Log:
  MFC r304232:
  In UFS_BALLOC(), invalidate pages of indirect buffers on failed block
  allocation unwinding.
  
  Approved by:	re (gjb)

Modified:
  releng/11.0/sys/ufs/ffs/ffs_balloc.c
Directory Properties:
  releng/11.0/   (props changed)

Modified: releng/11.0/sys/ufs/ffs/ffs_balloc.c
==============================================================================
--- releng/11.0/sys/ufs/ffs/ffs_balloc.c	Tue Aug 23 10:40:53 2016	(r304674)
+++ releng/11.0/sys/ufs/ffs/ffs_balloc.c	Tue Aug 23 12:22:35 2016	(r304675)
@@ -480,8 +480,8 @@ fail:
 		 */
 		bp = getblk(vp, *lbns_remfree, fs->fs_bsize, 0, 0, GB_NOCREAT);
 		if (bp != NULL) {
-			bp->b_flags |= (B_INVAL | B_RELBUF);
-			bp->b_flags &= ~B_ASYNC;
+			bp->b_flags |= B_INVAL | B_RELBUF | B_NOCACHE;
+			bp->b_flags &= ~(B_ASYNC | B_CACHE);
 			brelse(bp);
 		}
 		deallocated += fs->fs_bsize;
@@ -1051,8 +1051,8 @@ fail:
 		 */
 		bp = getblk(vp, *lbns_remfree, fs->fs_bsize, 0, 0, GB_NOCREAT);
 		if (bp != NULL) {
-			bp->b_flags |= (B_INVAL | B_RELBUF);
-			bp->b_flags &= ~B_ASYNC;
+			bp->b_flags |= B_INVAL | B_RELBUF | B_NOCACHE;
+			bp->b_flags &= ~(B_ASYNC | B_CACHE);
 			brelse(bp);
 		}
 		deallocated += fs->fs_bsize;