Deleted Added
sdiff udiff text old ( 136943 ) new ( 136966 )
full compact
vfs_subr.c (136943) vfs_subr.c (136966)
1/*
2 * Copyright (c) 1989, 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.

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

34 * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
35 */
36
37/*
38 * External virtual filesystem routines
39 */
40
41#include <sys/cdefs.h>
1/*
2 * Copyright (c) 1989, 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.

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

34 * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
35 */
36
37/*
38 * External virtual filesystem routines
39 */
40
41#include <sys/cdefs.h>
42__FBSDID("$FreeBSD: head/sys/kern/vfs_subr.c 136943 2004-10-25 09:14:03Z phk $");
42__FBSDID("$FreeBSD: head/sys/kern/vfs_subr.c 136966 2004-10-26 07:39:12Z phk $");
43
44#include "opt_ddb.h"
45#include "opt_mac.h"
46
47#include <sys/param.h>
48#include <sys/systm.h>
49#include <sys/bio.h>
50#include <sys/buf.h>

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

858#ifdef MAC
859 mac_init_vnode(vp);
860 if (mp != NULL && (mp->mnt_flag & MNT_MULTILABEL) == 0)
861 mac_associate_vnode_singlelabel(mp, vp);
862 else if (mp == NULL)
863 printf("NULL mp in getnewvnode()\n");
864#endif
865 delmntque(vp);
43
44#include "opt_ddb.h"
45#include "opt_mac.h"
46
47#include <sys/param.h>
48#include <sys/systm.h>
49#include <sys/bio.h>
50#include <sys/buf.h>

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

858#ifdef MAC
859 mac_init_vnode(vp);
860 if (mp != NULL && (mp->mnt_flag & MNT_MULTILABEL) == 0)
861 mac_associate_vnode_singlelabel(mp, vp);
862 else if (mp == NULL)
863 printf("NULL mp in getnewvnode()\n");
864#endif
865 delmntque(vp);
866 if (mp != NULL)
866 if (mp != NULL) {
867 insmntque(vp, mp);
867 insmntque(vp, mp);
868 bo->bo_bsize = mp->mnt_stat.f_iosize;
869 }
868
869 return (0);
870}
871
872/*
873 * Delete from old mount point vnode list, if on one.
874 */
875static void

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

1807
1808 error = getnewvnode("none", (struct mount *)0, devfs_specop_p, &nvp);
1809 if (error) {
1810 *vpp = NULLVP;
1811 return (error);
1812 }
1813 vp = nvp;
1814 vp->v_type = VCHR;
870
871 return (0);
872}
873
874/*
875 * Delete from old mount point vnode list, if on one.
876 */
877static void

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

1809
1810 error = getnewvnode("none", (struct mount *)0, devfs_specop_p, &nvp);
1811 if (error) {
1812 *vpp = NULLVP;
1813 return (error);
1814 }
1815 vp = nvp;
1816 vp->v_type = VCHR;
1817 vp->v_bufobj.bo_bsize = DEV_BSIZE;
1815 addalias(vp, dev);
1816 *vpp = vp;
1817 return (0);
1818}
1819
1820static void
1821v_incr_usecount(struct vnode *vp, int delta)
1822{

--- 2168 unchanged lines hidden --- 		1818 addalias(vp, dev);
1819 *vpp = vp;
1820 return (0);
1821}
1822
1823static void
1824v_incr_usecount(struct vnode *vp, int delta)
1825{

--- 2168 unchanged lines hidden ---