| ffs_subr.c (8876) | ffs_subr.c (10551) |
|---|---|
| 1/* 2 * Copyright (c) 1982, 1986, 1989, 1993 3 * The Regents of the University of California. 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 --- 17 unchanged lines hidden (view full) --- 26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 * 33 * @(#)ffs_subr.c 8.2 (Berkeley) 9/21/93 | 1/* 2 * Copyright (c) 1982, 1986, 1989, 1993 3 * The Regents of the University of California. 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 --- 17 unchanged lines hidden (view full) --- 26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 * 33 * @(#)ffs_subr.c 8.2 (Berkeley) 9/21/93 |
| 34 * $Id: ffs_subr.c,v 1.3 1994/10/10 01:04:38 phk Exp $ | 34 * $Id: ffs_subr.c,v 1.4 1995/05/30 08:15:00 rgrimes Exp $ |
| 35 */ 36 37#include <sys/param.h> 38#include <ufs/ffs/fs.h> 39 40#ifdef KERNEL 41#include <sys/systm.h> 42#include <sys/vnode.h> --- 87 unchanged lines hidden (view full) --- 130 131 ebp = &buf[nbuf]; 132 start = bp->b_blkno; 133 last = start + btodb(bp->b_bcount) - 1; 134 for (ep = buf; ep < ebp; ep++) { 135 if (ep == bp || (ep->b_flags & B_INVAL) || 136 ep->b_vp == NULLVP) 137 continue; | 35 */ 36 37#include <sys/param.h> 38#include <ufs/ffs/fs.h> 39 40#ifdef KERNEL 41#include <sys/systm.h> 42#include <sys/vnode.h> --- 87 unchanged lines hidden (view full) --- 130 131 ebp = &buf[nbuf]; 132 start = bp->b_blkno; 133 last = start + btodb(bp->b_bcount) - 1; 134 for (ep = buf; ep < ebp; ep++) { 135 if (ep == bp || (ep->b_flags & B_INVAL) || 136 ep->b_vp == NULLVP) 137 continue; |
| 138 if (VOP_BMAP(ep->b_vp, (daddr_t)0, &vp, (daddr_t)0, NULL)) | 138 if (VOP_BMAP(ep->b_vp, (daddr_t)0, &vp, (daddr_t)0, NULL, NULL)) |
| 139 continue; 140 if (vp != ip->i_devvp) 141 continue; 142 /* look for overlap */ 143 if (ep->b_bcount == 0 || ep->b_blkno > last || 144 ep->b_blkno + btodb(ep->b_bcount) <= start) 145 continue; 146 vprint("Disk overlap", vp); --- 94 unchanged lines hidden --- | 139 continue; 140 if (vp != ip->i_devvp) 141 continue; 142 /* look for overlap */ 143 if (ep->b_bcount == 0 || ep->b_blkno > last || 144 ep->b_blkno + btodb(ep->b_bcount) <= start) 145 continue; 146 vprint("Disk overlap", vp); --- 94 unchanged lines hidden --- |