| ext2_bmap.c (43311) | ext2_bmap.c (46349) |
|---|---|
| 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 * $Id: ufs_bmap.c,v 1.24 1998/10/27 11:47:08 bde Exp $ | 39 * $Id: ufs_bmap.c,v 1.25 1999/01/28 00:57:55 dillon Exp $ |
| 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> --- 175 unchanged lines hidden (view full) --- 223 bp = getblk(vp, metalbn, mp->mnt_stat.f_iosize, 0, 0); 224 if ((bp->b_flags & B_CACHE) == 0) { 225#ifdef DIAGNOSTIC 226 if (!daddr) 227 panic("ufs_bmaparray: indirect block not in cache"); 228#endif 229 bp->b_blkno = blkptrtodb(ump, daddr); 230 bp->b_flags |= B_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> --- 175 unchanged lines hidden (view full) --- 223 bp = getblk(vp, metalbn, mp->mnt_stat.f_iosize, 0, 0); 224 if ((bp->b_flags & B_CACHE) == 0) { 225#ifdef DIAGNOSTIC 226 if (!daddr) 227 panic("ufs_bmaparray: indirect block not in cache"); 228#endif 229 bp->b_blkno = blkptrtodb(ump, daddr); 230 bp->b_flags |= B_READ; |
| 231 bp->b_flags &= ~(B_INVAL|B_ERROR); |
|
| 231 vfs_busy_pages(bp, 0); 232 VOP_STRATEGY(bp->b_vp, bp); 233 curproc->p_stats->p_ru.ru_inblock++; /* XXX */ 234 error = biowait(bp); 235 if (error) { 236 brelse(bp); 237 return (error); 238 } --- 116 unchanged lines hidden --- | 232 vfs_busy_pages(bp, 0); 233 VOP_STRATEGY(bp->b_vp, bp); 234 curproc->p_stats->p_ru.ru_inblock++; /* XXX */ 235 error = biowait(bp); 236 if (error) { 237 brelse(bp); 238 return (error); 239 } --- 116 unchanged lines hidden --- |