diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2013-04-23 12:49:53 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2013-04-23 12:49:53 +0000 |
| commit | c7c1d0ec4dcce7d1215a74c3a82f8090a083a764 (patch) | |
| tree | 7d075e8ef384ba538ca2eafcf52401ec088ccd9b /sys/dev/softraid_raid6.c | |
| parent | 43a684b2ebd070b7260a0a4f05b640a8ff7f5782 (diff) | |
Rename ccb_flag to ccb_flags.
Diffstat (limited to 'sys/dev/softraid_raid6.c')
| -rw-r--r-- | sys/dev/softraid_raid6.c | 8 |
1 files changed, 4 insertions, 4 deletions
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; |