[src/trunk]: src/sys OR into bp->b_cflags; don't overwrite.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys OR into bp->b_cflags; don't overwrite.
From: ad <ad%NetBSD.org@localhost>
Date: Sat, 01 May 2021 03:44:05 +0000

details:   https://anonhg.NetBSD.org/src/rev/f715bf044da5
branches:  trunk
changeset: 970159:f715bf044da5
user:      ad <ad%NetBSD.org@localhost>
date:      Sat Mar 14 15:31:29 2020 +0000

description:
OR into bp->b_cflags; don't overwrite.

diffstat:

 sys/kern/kern_physio.c      |   8 ++++----
 sys/kern/vfs_wapbl.c        |   8 ++++----
 sys/miscfs/genfs/genfs_io.c |  10 +++++-----
 sys/ufs/lfs/lfs_bio.c       |   6 +++---
 sys/ufs/lfs/lfs_vfsops.c    |   6 +++---
 5 files changed, 19 insertions(+), 19 deletions(-)

diffs (171 lines):

diff -r 010d25398006 -r f715bf044da5 sys/kern/kern_physio.c
--- a/sys/kern/kern_physio.c    Sat Mar 14 14:15:43 2020 +0000
+++ b/sys/kern/kern_physio.c    Sat Mar 14 15:31:29 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_physio.c,v 1.97 2019/12/08 19:52:37 ad Exp $      */
+/*     $NetBSD: kern_physio.c,v 1.98 2020/03/14 15:31:29 ad Exp $      */
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_physio.c,v 1.97 2019/12/08 19:52:37 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_physio.c,v 1.98 2020/03/14 15:31:29 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -283,7 +283,7 @@
                                bp = obp;
                        } else {
                                bp = getiobuf(NULL, true);
-                               bp->b_cflags = BC_BUSY;
+                               bp->b_cflags |= BC_BUSY;
                        }
                        bp->b_dev = dev;
                        bp->b_proc = p;
@@ -296,7 +296,7 @@
                         * raw transfers".
                         */
                        bp->b_oflags = 0;
-                       bp->b_cflags = BC_BUSY;
+                       bp->b_cflags |= BC_BUSY;
                        bp->b_flags = flags | B_PHYS | B_RAW;
                        bp->b_iodone = physio_biodone;
 
diff -r 010d25398006 -r f715bf044da5 sys/kern/vfs_wapbl.c
--- a/sys/kern/vfs_wapbl.c      Sat Mar 14 14:15:43 2020 +0000
+++ b/sys/kern/vfs_wapbl.c      Sat Mar 14 15:31:29 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_wapbl.c,v 1.104 2020/03/08 18:26:59 ad Exp $       */
+/*     $NetBSD: vfs_wapbl.c,v 1.105 2020/03/14 15:32:51 ad Exp $       */
 
 /*-
  * Copyright (c) 2003, 2008, 2009 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 #define WAPBL_INTERNAL
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.104 2020/03/08 18:26:59 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.105 2020/03/14 15:32:51 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/bitops.h>
@@ -922,7 +922,7 @@
 
        bp = getiobuf(devvp, true);
        bp->b_flags = flags;
-       bp->b_cflags = BC_BUSY; /* mandatory, asserted by biowait() */
+       bp->b_cflags |= BC_BUSY;        /* mandatory, asserted by biowait() */
        bp->b_dev = devvp->v_rdev;
        bp->b_data = data;
        bp->b_bufsize = bp->b_resid = bp->b_bcount = len;
@@ -997,7 +997,7 @@
        TAILQ_REMOVE(&wl->wl_iobufs, bp, b_wapbllist);
 
        bp->b_flags |= B_WRITE;
-       bp->b_cflags = BC_BUSY; /* mandatory, asserted by biowait() */
+       bp->b_cflags |= BC_BUSY;        /* mandatory, asserted by biowait() */
        bp->b_oflags = 0;
        bp->b_bcount = bp->b_resid;
        BIO_SETPRIO(bp, BPRIO_TIMECRITICAL);
diff -r 010d25398006 -r f715bf044da5 sys/miscfs/genfs/genfs_io.c
--- a/sys/miscfs/genfs/genfs_io.c       Sat Mar 14 14:15:43 2020 +0000
+++ b/sys/miscfs/genfs/genfs_io.c       Sat Mar 14 15:31:29 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: genfs_io.c,v 1.88 2020/02/27 22:12:54 ad Exp $ */
+/*     $NetBSD: genfs_io.c,v 1.89 2020/03/14 15:34:24 ad Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.88 2020/02/27 22:12:54 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.89 2020/03/14 15:34:24 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -615,7 +615,7 @@
        mbp->b_bufsize = totalbytes;
        mbp->b_data = (void *)kva;
        mbp->b_resid = mbp->b_bcount = bytes;
-       mbp->b_cflags = BC_BUSY;
+       mbp->b_cflags |= BC_BUSY;
        if (async) {
                mbp->b_flags = B_READ | B_ASYNC;
                mbp->b_iodone = uvm_aio_aiodone;
@@ -1497,7 +1497,7 @@
        mbp->b_bufsize = len;
        mbp->b_data = (void *)kva;
        mbp->b_resid = mbp->b_bcount = bytes;
-       mbp->b_cflags = BC_BUSY | BC_AGE;
+       mbp->b_cflags |= BC_BUSY | BC_AGE;
        if (async) {
                mbp->b_flags = brw | B_ASYNC;
                mbp->b_iodone = iodone;
@@ -1735,7 +1735,7 @@
        mutex_exit(vp->v_interlock);
 
        bp = getiobuf(vp, true);
-       bp->b_cflags = BC_BUSY | BC_AGE;
+       bp->b_cflags |= BC_BUSY | BC_AGE;
        bp->b_lblkno = offset >> vp->v_mount->mnt_fs_bshift;
        bp->b_data = (char *)kva;
        bp->b_bcount = npages << PAGE_SHIFT;
diff -r 010d25398006 -r f715bf044da5 sys/ufs/lfs/lfs_bio.c
--- a/sys/ufs/lfs/lfs_bio.c     Sat Mar 14 14:15:43 2020 +0000
+++ b/sys/ufs/lfs/lfs_bio.c     Sat Mar 14 15:31:29 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_bio.c,v 1.146 2020/02/23 08:39:28 riastradh Exp $  */
+/*     $NetBSD: lfs_bio.c,v 1.147 2020/03/14 15:35:35 ad Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003, 2008 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.146 2020/02/23 08:39:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.147 2020/03/14 15:35:35 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -735,7 +735,7 @@
        bp->b_error = 0;
        bp->b_resid = 0;
        bp->b_iodone = lfs_free_aiodone;
-       bp->b_cflags = BC_BUSY | BC_NOCACHE;
+       bp->b_cflags |= BC_BUSY | BC_NOCACHE;
        bp->b_private = fs;
 
        mutex_enter(&bufcache_lock);
diff -r 010d25398006 -r f715bf044da5 sys/ufs/lfs/lfs_vfsops.c
--- a/sys/ufs/lfs/lfs_vfsops.c  Sat Mar 14 14:15:43 2020 +0000
+++ b/sys/ufs/lfs/lfs_vfsops.c  Sat Mar 14 15:31:29 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_vfsops.c,v 1.374 2020/02/23 15:46:42 ad Exp $      */
+/*     $NetBSD: lfs_vfsops.c,v 1.375 2020/03/14 15:35:35 ad Exp $      */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.374 2020/02/23 15:46:42 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.375 2020/03/14 15:35:35 ad Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_lfs.h"
@@ -2127,7 +2127,7 @@
        mbp->b_bufsize = npages << PAGE_SHIFT;
        mbp->b_data = (void *)kva;
        mbp->b_resid = mbp->b_bcount = bytes;
-       mbp->b_cflags = BC_BUSY|BC_AGE;
+       mbp->b_cflags |= BC_BUSY|BC_AGE;
        mbp->b_iodone = uvm_aio_aiodone;
 
        bp = NULL;

Prev by Date: [src/trunk]: src pmap_remove_all(): Return a boolean value to indicate the be...
Next by Date: [src/trunk]: src/sys/uvm - uvmspace_exec(), uvmspace_free(): if pmap_remove_a...
Previous by Thread: [src/trunk]: src pmap_remove_all(): Return a boolean value to indicate the be...
Next by Thread: [src/trunk]: src/sys/uvm - uvmspace_exec(), uvmspace_free(): if pmap_remove_a...
Indexes:

Home | Main Index | Thread Index | Old Index