Deleted Added
full compact
ffs_inode.c (63897) ffs_inode.c (68885)
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 63897 2000-07-26 23:07:01Z mckusick $
34 * $FreeBSD: head/sys/ufs/ffs/ffs_inode.c 68885 2000-11-18 23:06:26Z dillon $
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>
43#include <sys/bio.h>
44#include <sys/buf.h>
45#include <sys/vnode.h>
46#include <sys/malloc.h>
47#include <sys/resourcevar.h>
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>
43#include <sys/bio.h>
44#include <sys/buf.h>
45#include <sys/vnode.h>
46#include <sys/malloc.h>
47#include <sys/resourcevar.h>
48#include <sys/vmmeter.h>
48#include <sys/stat.h>
49
50#include <vm/vm.h>
51#include <vm/vm_extern.h>
52
53#include <ufs/ufs/extattr.h>
54#include <ufs/ufs/quota.h>
55#include <ufs/ufs/ufsmount.h>

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

106 if (DOINGSOFTDEP(vp))
107 softdep_update_inodeblock(ip, bp, waitfor);
108 else if (ip->i_effnlink != ip->i_nlink)
109 panic("ffs_update: bad link cnt");
110 *((struct dinode *)bp->b_data +
111 ino_to_fsbo(fs, ip->i_number)) = ip->i_din;
112 if (waitfor && !DOINGASYNC(vp)) {
113 return (bwrite(bp));
49#include <sys/stat.h>
50
51#include <vm/vm.h>
52#include <vm/vm_extern.h>
53
54#include <ufs/ufs/extattr.h>
55#include <ufs/ufs/quota.h>
56#include <ufs/ufs/ufsmount.h>

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

107 if (DOINGSOFTDEP(vp))
108 softdep_update_inodeblock(ip, bp, waitfor);
109 else if (ip->i_effnlink != ip->i_nlink)
110 panic("ffs_update: bad link cnt");
111 *((struct dinode *)bp->b_data +
112 ino_to_fsbo(fs, ip->i_number)) = ip->i_din;
113 if (waitfor && !DOINGASYNC(vp)) {
114 return (bwrite(bp));
115 } else if (vm_page_count_severe() || buf_dirty_count_severe()) {
116 return (bwrite(bp));
114 } else {
115 if (bp->b_bufsize == fs->fs_bsize)
116 bp->b_flags |= B_CLUSTEROK;
117 bdwrite(bp);
118 return (0);
119 }
120}
121

--- 406 unchanged lines hidden ---
117 } else {
118 if (bp->b_bufsize == fs->fs_bsize)
119 bp->b_flags |= B_CLUSTEROK;
120 bdwrite(bp);
121 return (0);
122 }
123}
124

--- 406 unchanged lines hidden ---