CVS commit: src/sys/dev/raidframe

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Thu Mar 30 11:02:15 UTC 2023

Modified Files:
        src/sys/dev/raidframe: rf_netbsdkintf.c

Log Message:
raidframe: Nix unused parameter to raidwrite_component_area.

All calls use the same value.  Prune dead branches using it.


To generate a diff of this commit:
cvs rdiff -u -r1.410 -r1.411 src/sys/dev/raidframe/rf_netbsdkintf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.410 src/sys/dev/raidframe/rf_netbsdkintf.c:1.411
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.410	Sun Aug 28 00:37:41 2022
+++ src/sys/dev/raidframe/rf_netbsdkintf.c	Thu Mar 30 11:02:15 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_netbsdkintf.c,v 1.410 2022/08/28 00:37:41 oster Exp $	*/
+/*	$NetBSD: rf_netbsdkintf.c,v 1.411 2023/03/30 11:02:15 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  ***********************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.410 2022/08/28 00:37:41 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.411 2023/03/30 11:02:15 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_raid_autoconfig.h"
@@ -189,7 +189,7 @@ static int raid_detach(device_t, int);
 static int raidread_component_area(dev_t, struct vnode *, void *, size_t,
     daddr_t, daddr_t);
 static int raidwrite_component_area(dev_t, struct vnode *, void *, size_t,
-    daddr_t, daddr_t, int);
+    daddr_t, daddr_t);
 
 static int raidwrite_component_label(unsigned,
     dev_t, struct vnode *, RF_ComponentLabel_t *);
@@ -2450,7 +2450,7 @@ raidwrite_component_label(unsigned secsi
 	error = raidwrite_component_area(dev, b_vp, clabel_write,
 	    sizeof(RF_ComponentLabel_t),
 	    rf_component_info_offset(),
-	    rf_component_info_size(secsize), 0);
+	    rf_component_info_size(secsize));
 
 	return error;
 }
@@ -2458,7 +2458,7 @@ raidwrite_component_label(unsigned secsi
 /* ARGSUSED */
 static int
 raidwrite_component_area(dev_t dev, struct vnode *b_vp, void *data,
-    size_t msize, daddr_t offset, daddr_t dsize, int asyncp)
+    size_t msize, daddr_t offset, daddr_t dsize)
 {
 	struct buf *bp;
 	int error;
@@ -2470,15 +2470,13 @@ raidwrite_component_area(dev_t dev, stru
 	/* get our ducks in a row for the write */
 	bp->b_blkno = offset / DEV_BSIZE;
 	bp->b_bcount = dsize;
-	bp->b_flags |= B_WRITE | (asyncp ? B_ASYNC : 0);
+	bp->b_flags |= B_WRITE;
  	bp->b_resid = dsize;
 
 	memset(bp->b_data, 0, dsize);
 	memcpy(bp->b_data, data, msize);
 
 	bdev_strategy(bp);
-	if (asyncp)
-		return 0;
 	error = biowait(bp);
 	brelse(bp, 0);
 	if (error) {
@@ -2504,7 +2502,7 @@ rf_paritymap_kern_write(RF_Raid_t *raidP
 		    raidPtr->raid_cinfo[c].ci_vp, map,
 		    RF_PARITYMAP_NBYTE,
 		    rf_parity_map_offset(raidPtr),
-		    rf_parity_map_size(raidPtr), 0);
+		    rf_parity_map_size(raidPtr));
 	}
 }