diff options
| -rw-r--r-- | sys/dev/softraid.c | 6 | ||||
| -rw-r--r-- | sys/dev/softraid_raid6.c | 8 | ||||
| -rw-r--r-- | sys/dev/softraid_raidp.c | 8 | ||||
| -rw-r--r-- | sys/dev/softraidvar.h | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index e75ca773d73..b63ba7ed547 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.300 2013/04/21 13:00:21 jsing Exp $ */ +/* $OpenBSD: softraid.c,v 1.301 2013/04/23 12:49:52 jsing Exp $ */ /* * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org> @@ -2010,7 +2010,7 @@ sr_ccb_put(struct sr_ccb *ccb) struct sr_ccb * sr_ccb_rw(struct sr_discipline *sd, int chunk, daddr64_t blkno, - daddr64_t len, u_int8_t *data, int xsflags, int ccbflag) + daddr64_t len, u_int8_t *data, int xsflags, int ccbflags) { struct sr_chunk *sc = sd->sd_vol.sv_chunks[chunk]; struct sr_ccb *ccb = NULL; @@ -2019,7 +2019,7 @@ sr_ccb_rw(struct sr_discipline *sd, int chunk, daddr64_t blkno, if (ccb == NULL) goto out; - ccb->ccb_flag = ccbflag; + ccb->ccb_flags = ccbflags; ccb->ccb_target = chunk; ccb->ccb_buf.b_flags = B_PHYS | B_CALL; diff --git a/sys/dev/softraid_raid6.c b/sys/dev/softraid_raid6.c index d66c8f00c91..534e6a81f97 100644 --- a/sys/dev/softraid_raid6.c +++ b/sys/dev/softraid_raid6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_raid6.c,v 1.44 2013/03/31 15:44:52 jsing Exp $ */ +/* $OpenBSD: softraid_raid6.c,v 1.45 2013/04/23 12:49:52 jsing Exp $ */ /* * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2009 Jordan Hargrave <jordan@openbsd.org> @@ -713,7 +713,7 @@ sr_raid6_intr(struct buf *bp) } /* Free allocated data buffer. */ - if (ccb->ccb_flag & SR_CCBF_FREEBUF) { + if (ccb->ccb_flags & SR_CCBF_FREEBUF) { sr_put_block(sd, ccb->ccb_buf.b_data, ccb->ccb_buf.b_bcount); ccb->ccb_buf.b_data = NULL; } @@ -786,7 +786,7 @@ done: int sr_raid6_addio(struct sr_workunit *wu, int dsk, daddr64_t blk, daddr64_t len, - void *data, int flag, int ccbflag, void *pbuf, void *qbuf, int gn) + void *data, int flag, int ccbflags, void *pbuf, void *qbuf, int gn) { struct sr_discipline *sd = wu->swu_dis; struct sr_ccb *ccb; @@ -807,7 +807,7 @@ sr_raid6_addio(struct sr_workunit *wu, int dsk, daddr64_t blk, daddr64_t len, flag & SCSI_DATA_IN ? "read" : "write", dsk, blk, len, pbuf, qbuf); - ccb->ccb_flag = ccbflag; + ccb->ccb_flags = ccbflags; if (flag & SCSI_POLL) { ccb->ccb_buf.b_flags = 0; ccb->ccb_buf.b_iodone = NULL; diff --git a/sys/dev/softraid_raidp.c b/sys/dev/softraid_raidp.c index dbae4a3ea8e..ee71da83876 100644 --- a/sys/dev/softraid_raidp.c +++ b/sys/dev/softraid_raidp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_raidp.c,v 1.41 2013/03/31 15:44:52 jsing Exp $ */ +/* $OpenBSD: softraid_raidp.c,v 1.42 2013/04/23 12:49:52 jsing Exp $ */ /* * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2009 Jordan Hargrave <jordan@openbsd.org> @@ -534,7 +534,7 @@ sr_raidp_intr(struct buf *bp) ccb->ccb_buf.b_bcount); /* Free allocated data buffer. */ - if (ccb->ccb_flag & SR_CCBF_FREEBUF) { + if (ccb->ccb_flags & SR_CCBF_FREEBUF) { sr_put_block(sd, ccb->ccb_buf.b_data, ccb->ccb_buf.b_bcount); ccb->ccb_buf.b_data = NULL; } @@ -606,7 +606,7 @@ done: int sr_raidp_addio(struct sr_workunit *wu, int dsk, daddr64_t blk, daddr64_t len, - void *data, int flag, int ccbflag, void *xorbuf) + void *data, int flag, int ccbflags, void *xorbuf) { struct sr_discipline *sd = wu->swu_dis; struct sr_ccb *ccb; @@ -627,7 +627,7 @@ sr_raidp_addio(struct sr_workunit *wu, int dsk, daddr64_t blk, daddr64_t len, dsk, blk, len, xorbuf ? "X0R" : "-"); - ccb->ccb_flag = ccbflag; + ccb->ccb_flags = ccbflags; if (flag & SCSI_POLL) { ccb->ccb_buf.b_flags = 0; ccb->ccb_buf.b_iodone = NULL; diff --git a/sys/dev/softraidvar.h b/sys/dev/softraidvar.h index ea0ad50d4c7..fe8f9e34867 100644 --- a/sys/dev/softraidvar.h +++ b/sys/dev/softraidvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: softraidvar.h,v 1.134 2013/04/21 13:00:21 jsing Exp $ */ +/* $OpenBSD: softraidvar.h,v 1.135 2013/04/23 12:49:52 jsing Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org> @@ -355,7 +355,7 @@ struct sr_ccb { #define SR_CCB_OK 2 #define SR_CCB_FAILED 3 - int ccb_flag; + int ccb_flags; #define SR_CCBF_FREEBUF (1<<0) /* free ccb_buf.b_data */ void *ccb_opaque; /* discipline usable pointer */ |