| ufs_bmap.c (58349) | ufs_bmap.c (58934) |
|---|---|
| 1/* 2 * Copyright (c) 1989, 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * (c) UNIX System Laboratories, Inc. 5 * All or some portions of this file are derived from material licensed 6 * to the University of California by American Telephone and Telegraph 7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 8 * the permission of UNIX System Laboratories, Inc. --- 22 unchanged lines hidden (view full) --- 31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 36 * SUCH DAMAGE. 37 * 38 * @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95 | 1/* 2 * Copyright (c) 1989, 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * (c) UNIX System Laboratories, Inc. 5 * All or some portions of this file are derived from material licensed 6 * to the University of California by American Telephone and Telegraph 7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 8 * the permission of UNIX System Laboratories, Inc. --- 22 unchanged lines hidden (view full) --- 31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 36 * SUCH DAMAGE. 37 * 38 * @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95 |
| 39 * $FreeBSD: head/sys/ufs/ufs/ufs_bmap.c 58349 2000-03-20 11:29:10Z phk $ | 39 * $FreeBSD: head/sys/ufs/ufs/ufs_bmap.c 58934 2000-04-02 15:24:56Z phk $ |
| 40 */ 41 42#include <sys/param.h> 43#include <sys/systm.h> 44#include <sys/buf.h> 45#include <sys/proc.h> 46#include <sys/vnode.h> 47#include <sys/mount.h> --- 140 unchanged lines hidden (view full) --- 188 bp = getblk(vp, metalbn, mp->mnt_stat.f_iosize, 0, 0); 189 if ((bp->b_flags & B_CACHE) == 0) { 190#ifdef DIAGNOSTIC 191 if (!daddr) 192 panic("ufs_bmaparray: indirect block not in cache"); 193#endif 194 bp->b_blkno = blkptrtodb(ump, daddr); 195 bp->b_iocmd = BIO_READ; | 40 */ 41 42#include <sys/param.h> 43#include <sys/systm.h> 44#include <sys/buf.h> 45#include <sys/proc.h> 46#include <sys/vnode.h> 47#include <sys/mount.h> --- 140 unchanged lines hidden (view full) --- 188 bp = getblk(vp, metalbn, mp->mnt_stat.f_iosize, 0, 0); 189 if ((bp->b_flags & B_CACHE) == 0) { 190#ifdef DIAGNOSTIC 191 if (!daddr) 192 panic("ufs_bmaparray: indirect block not in cache"); 193#endif 194 bp->b_blkno = blkptrtodb(ump, daddr); 195 bp->b_iocmd = BIO_READ; |
| 196 bp->b_flags &= ~(B_INVAL|B_ERROR); | 196 bp->b_flags &= ~B_INVAL; 197 bp->b_ioflags &= ~BIO_ERROR; |
| 197 vfs_busy_pages(bp, 0); 198 BUF_STRATEGY(bp); 199 curproc->p_stats->p_ru.ru_inblock++; /* XXX */ 200 error = biowait(bp); 201 if (error) { 202 brelse(bp); 203 return (error); 204 } --- 116 unchanged lines hidden --- | 198 vfs_busy_pages(bp, 0); 199 BUF_STRATEGY(bp); 200 curproc->p_stats->p_ru.ru_inblock++; /* XXX */ 201 error = biowait(bp); 202 if (error) { 203 brelse(bp); 204 return (error); 205 } --- 116 unchanged lines hidden --- |