Deleted Added
full compact
null_vfsops.c (172697) null_vfsops.c (175202)
1/*-
2 * Copyright (c) 1992, 1993, 1995
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software donated to Berkeley by
6 * Jan-Simon Pendry.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
32 * @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94
33 *
34 * @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92
1/*-
2 * Copyright (c) 1992, 1993, 1995
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software donated to Berkeley by
6 * Jan-Simon Pendry.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
32 * @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94
33 *
34 * @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92
35 * $FreeBSD: head/sys/fs/nullfs/null_vfsops.c 172697 2007-10-16 10:54:55Z alfred $
35 * $FreeBSD: head/sys/fs/nullfs/null_vfsops.c 175202 2008-01-10 01:10:58Z attilio $
36 */
37
38/*
39 * Null Layer
40 * (See null_vnops.c for a description of what this does.)
41 */
42
43#include <sys/param.h>

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

116 */
117 NDINIT(ndp, LOOKUP, FOLLOW|LOCKLEAF,
118 UIO_SYSSPACE, target, td);
119 error = namei(ndp);
120 /*
121 * Re-lock vnode.
122 */
123 if (isvnunlocked && !VOP_ISLOCKED(mp->mnt_vnodecovered, NULL))
36 */
37
38/*
39 * Null Layer
40 * (See null_vnops.c for a description of what this does.)
41 */
42
43#include <sys/param.h>

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

116 */
117 NDINIT(ndp, LOOKUP, FOLLOW|LOCKLEAF,
118 UIO_SYSSPACE, target, td);
119 error = namei(ndp);
120 /*
121 * Re-lock vnode.
122 */
123 if (isvnunlocked && !VOP_ISLOCKED(mp->mnt_vnodecovered, NULL))
124 vn_lock(mp->mnt_vnodecovered, LK_EXCLUSIVE | LK_RETRY, td);
124 vn_lock(mp->mnt_vnodecovered, LK_EXCLUSIVE | LK_RETRY);
125
126 if (error)
127 return (error);
128 NDFREE(ndp, NDF_ONLY_PNBUF);
129
130 /*
131 * Sanity check on lower vnode
132 */

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

245 */
246 vp = MOUNTTONULLMOUNT(mp)->nullm_rootvp;
247 VREF(vp);
248
249#ifdef NULLFS_DEBUG
250 if (VOP_ISLOCKED(vp, NULL))
251 panic("root vnode is locked.\n");
252#endif
125
126 if (error)
127 return (error);
128 NDFREE(ndp, NDF_ONLY_PNBUF);
129
130 /*
131 * Sanity check on lower vnode
132 */

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

245 */
246 vp = MOUNTTONULLMOUNT(mp)->nullm_rootvp;
247 VREF(vp);
248
249#ifdef NULLFS_DEBUG
250 if (VOP_ISLOCKED(vp, NULL))
251 panic("root vnode is locked.\n");
252#endif
253 vn_lock(vp, flags | LK_RETRY, td);
253 vn_lock(vp, flags | LK_RETRY);
254 *vpp = vp;
255 return 0;
256}
257
258static int
259nullfs_quotactl(mp, cmd, uid, arg, td)
260 struct mount *mp;
261 int cmd;

--- 109 unchanged lines hidden ---
254 *vpp = vp;
255 return 0;
256}
257
258static int
259nullfs_quotactl(mp, cmd, uid, arg, td)
260 struct mount *mp;
261 int cmd;

--- 109 unchanged lines hidden ---