Deleted Added
full compact
aac_disk.c (83366) aac_disk.c (86313)
1/*-
2 * Copyright (c) 2000 Michael Smith
3 * Copyright (c) 2001 Scott Long
4 * Copyright (c) 2000 BSDi
5 * Copyright (c) 2001 Adaptec, Inc.
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 12 unchanged lines hidden (view full) ---

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
1/*-
2 * Copyright (c) 2000 Michael Smith
3 * Copyright (c) 2001 Scott Long
4 * Copyright (c) 2000 BSDi
5 * Copyright (c) 2001 Adaptec, Inc.
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 12 unchanged lines hidden (view full) ---

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $FreeBSD: head/sys/dev/aac/aac_disk.c 83366 2001-09-12 08:38:13Z julian $
29 * $FreeBSD: head/sys/dev/aac/aac_disk.c 86313 2001-11-13 01:08:54Z ps $
30 */
31
32#include "opt_aac.h"
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/kernel.h>
37#include <sys/sysctl.h>

--- 225 unchanged lines hidden (view full) ---

263 * Queue the block to the controller. If the queue is full,
264 * EBUSY will be returned.
265 */
266 error = aac_dump_enqueue(ad, blkno, va, dumppages);
267 if (error && (error != EBUSY))
268 return (error);
269
270 if (!error) {
30 */
31
32#include "opt_aac.h"
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/kernel.h>
37#include <sys/sysctl.h>

--- 225 unchanged lines hidden (view full) ---

263 * Queue the block to the controller. If the queue is full,
264 * EBUSY will be returned.
265 */
266 error = aac_dump_enqueue(ad, blkno, va, dumppages);
267 if (error && (error != EBUSY))
268 return (error);
269
270 if (!error) {
271 if (dumpstatus(addr, (long)(count * DEV_BSIZE)) < 0)
271 if (dumpstatus(addr, (off_t)count * DEV_BSIZE) < 0)
272 return (EINTR);
273
274 blkno += blkcnt * dumppages;
275 count -= blkcnt * dumppages;
276 addr += PAGE_SIZE * dumppages;
277 if (count > 0)
278 continue;
279 }

--- 134 unchanged lines hidden ---
272 return (EINTR);
273
274 blkno += blkcnt * dumppages;
275 count -= blkcnt * dumppages;
276 addr += PAGE_SIZE * dumppages;
277 if (count > 0)
278 continue;
279 }

--- 134 unchanged lines hidden ---