svn commit: r304672 - stable/10/sys/ufs/ffs

[Konstantin Belousov]

Author: kib
Date: Tue Aug 23 07:55:32 2016
New Revision: 304672
URL: https://svnweb.freebsd.org/changeset/base/304672

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

Modified:
  stable/10/sys/ufs/ffs/ffs_balloc.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/ufs/ffs/ffs_balloc.c
==============================================================================
--- stable/10/sys/ufs/ffs/ffs_balloc.c	Tue Aug 23 07:55:05 2016	(r304671)
+++ stable/10/sys/ufs/ffs/ffs_balloc.c	Tue Aug 23 07:55:32 2016	(r304672)
@@ -492,8 +492,8 @@ fail:
 			    (intmax_t)bp->b_lblkno, (uintmax_t)*lbns_remfree,
 			    (uintmax_t)bp->b_blkno,
 			    (uintmax_t)fsbtodb(fs, *blkp)));
-			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;
@@ -1087,8 +1087,8 @@ fail:
 			    (intmax_t)bp->b_lblkno, (uintmax_t)*lbns_remfree,
 			    (uintmax_t)bp->b_blkno,
 			    (uintmax_t)fsbtodb(fs, *blkp)));
-			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;