| tr_concat.c (240465) | tr_concat.c (242323) |
|---|---|
| 1/*- 2 * Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2010 Alexander Motin <mav@FreeBSD.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> |
| 28__FBSDID("$FreeBSD: head/sys/geom/raid/tr_concat.c 240465 2012-09-13 13:27:09Z mav $"); | 28__FBSDID("$FreeBSD: head/sys/geom/raid/tr_concat.c 242323 2012-10-29 18:04:38Z mav $"); |
| 29 30#include <sys/param.h> 31#include <sys/bio.h> 32#include <sys/endian.h> 33#include <sys/kernel.h> 34#include <sys/kobj.h> 35#include <sys/lock.h> 36#include <sys/malloc.h> --- 206 unchanged lines hidden (view full) --- 243 if (cbp == NULL) 244 goto failure; 245 cbp->bio_offset = offset; 246 cbp->bio_data = addr; 247 cbp->bio_length = length; 248 cbp->bio_caller1 = sd; 249 bioq_insert_tail(&queue, cbp); 250 remain -= length; | 29 30#include <sys/param.h> 31#include <sys/bio.h> 32#include <sys/endian.h> 33#include <sys/kernel.h> 34#include <sys/kobj.h> 35#include <sys/lock.h> 36#include <sys/malloc.h> --- 206 unchanged lines hidden (view full) --- 243 if (cbp == NULL) 244 goto failure; 245 cbp->bio_offset = offset; 246 cbp->bio_data = addr; 247 cbp->bio_length = length; 248 cbp->bio_caller1 = sd; 249 bioq_insert_tail(&queue, cbp); 250 remain -= length; |
| 251 addr += length; | 251 if (bp->bio_cmd != BIO_DELETE) 252 addr += length; |
| 252 offset = 0; 253 no++; 254 KASSERT(no < vol->v_disks_count || remain == 0, 255 ("Request ends after volume end (%ju, %ju)", 256 bp->bio_offset, bp->bio_length)); 257 } while (remain > 0); 258 for (cbp = bioq_first(&queue); cbp != NULL; 259 cbp = bioq_first(&queue)) { --- 85 unchanged lines hidden --- | 253 offset = 0; 254 no++; 255 KASSERT(no < vol->v_disks_count || remain == 0, 256 ("Request ends after volume end (%ju, %ju)", 257 bp->bio_offset, bp->bio_length)); 258 } while (remain > 0); 259 for (cbp = bioq_first(&queue); cbp != NULL; 260 cbp = bioq_first(&queue)) { --- 85 unchanged lines hidden --- |