svn commit: r366714 - stable/12/sys/ufs/ffs

[Konstantin Belousov]

Author: kib
Date: Thu Oct 15 00:50:26 2020
New Revision: 366714
URL: https://svnweb.freebsd.org/changeset/base/366714

Log:
  MFC r366551:
  Do not leak B_BARRIER.

Modified:
  stable/12/sys/ufs/ffs/ffs_vfsops.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/ufs/ffs/ffs_vfsops.c
==============================================================================
--- stable/12/sys/ufs/ffs/ffs_vfsops.c	Wed Oct 14 23:01:41 2020	(r366713)
+++ stable/12/sys/ufs/ffs/ffs_vfsops.c	Thu Oct 15 00:50:26 2020	(r366714)
@@ -2247,6 +2247,7 @@ ffs_geom_strategy(struct bufobj *bo, struct buf *bp)
 					    error != EOPNOTSUPP) {
 						bp->b_error = error;
 						bp->b_ioflags |= BIO_ERROR;
+						bp->b_flags &= ~B_BARRIER;
 						bufdone(bp);
 						return;
 					}
@@ -2259,6 +2260,7 @@ ffs_geom_strategy(struct bufobj *bo, struct buf *bp)
 				if (error != 0 && error != EOPNOTSUPP) {
 					bp->b_error = error;
 					bp->b_ioflags |= BIO_ERROR;
+					bp->b_flags &= ~B_BARRIER;
 					bufdone(bp);
 					return;
 				}