Deleted Added
full compact
ffs_inode.c (50477) ffs_inode.c (58345)
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_inode.c 8.13 (Berkeley) 4/21/95
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_inode.c 8.13 (Berkeley) 4/21/95
34 * $FreeBSD: head/sys/ufs/ffs/ffs_inode.c 50477 1999-08-28 01:08:13Z peter $
34 * $FreeBSD: head/sys/ufs/ffs/ffs_inode.c 58345 2000-03-20 10:44:49Z phk $
35 */
36
37#include "opt_quota.h"
38
39#include <sys/param.h>
40#include <sys/systm.h>
41#include <sys/mount.h>
42#include <sys/proc.h>

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

442 * to bmap on these blocks will fail. However, we already have
443 * the on disk address, so we have to set the b_blkno field
444 * explicitly instead of letting bread do everything for us.
445 */
446 vp = ITOV(ip);
447 bp = getblk(vp, lbn, (int)fs->fs_bsize, 0, 0);
448 if ((bp->b_flags & B_CACHE) == 0) {
449 curproc->p_stats->p_ru.ru_inblock++; /* pay for read */
35 */
36
37#include "opt_quota.h"
38
39#include <sys/param.h>
40#include <sys/systm.h>
41#include <sys/mount.h>
42#include <sys/proc.h>

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

442 * to bmap on these blocks will fail. However, we already have
443 * the on disk address, so we have to set the b_blkno field
444 * explicitly instead of letting bread do everything for us.
445 */
446 vp = ITOV(ip);
447 bp = getblk(vp, lbn, (int)fs->fs_bsize, 0, 0);
448 if ((bp->b_flags & B_CACHE) == 0) {
449 curproc->p_stats->p_ru.ru_inblock++; /* pay for read */
450 bp->b_flags |= B_READ;
450 bp->b_iocmd = BIO_READ;
451 bp->b_flags &= ~(B_ERROR|B_INVAL);
452 if (bp->b_bcount > bp->b_bufsize)
453 panic("ffs_indirtrunc: bad buffer size");
454 bp->b_blkno = dbn;
455 vfs_busy_pages(bp, 0);
456 VOP_STRATEGY(bp->b_vp, bp);
457 error = biowait(bp);
458 }

--- 64 unchanged lines hidden ---
451 bp->b_flags &= ~(B_ERROR|B_INVAL);
452 if (bp->b_bcount > bp->b_bufsize)
453 panic("ffs_indirtrunc: bad buffer size");
454 bp->b_blkno = dbn;
455 vfs_busy_pages(bp, 0);
456 VOP_STRATEGY(bp->b_vp, bp);
457 error = biowait(bp);
458 }

--- 64 unchanged lines hidden ---