| null_vfsops.c (138075) | null_vfsops.c (138290) |
|---|---|
| 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 138075 2004-11-25 09:11:27Z phk $ | 35 * $FreeBSD: head/sys/fs/nullfs/null_vfsops.c 138290 2004-12-01 23:16:38Z phk $ |
| 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> --- 56 unchanged lines hidden (view full) --- 100 error = vfs_getopt(mp->mnt_optnew, "target", (void **)&target, &len); 101 if (error || target[len - 1] != '\0') 102 return (EINVAL); 103 104 /* 105 * Unlock lower node to avoid deadlock. 106 * (XXX) VOP_ISLOCKED is needed? 107 */ | 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> --- 56 unchanged lines hidden (view full) --- 100 error = vfs_getopt(mp->mnt_optnew, "target", (void **)&target, &len); 101 if (error || target[len - 1] != '\0') 102 return (EINVAL); 103 104 /* 105 * Unlock lower node to avoid deadlock. 106 * (XXX) VOP_ISLOCKED is needed? 107 */ |
| 108 if ((mp->mnt_vnodecovered->v_op == null_vnodeop_p) && | 108 if ((mp->mnt_vnodecovered->v_op == &null_vnodeops) && |
| 109 VOP_ISLOCKED(mp->mnt_vnodecovered, NULL)) { 110 VOP_UNLOCK(mp->mnt_vnodecovered, 0, td); 111 isvnunlocked = 1; 112 } 113 /* 114 * Find lower node 115 */ 116 NDINIT(ndp, LOOKUP, FOLLOW|WANTPARENT|LOCKLEAF, --- 285 unchanged lines hidden --- | 109 VOP_ISLOCKED(mp->mnt_vnodecovered, NULL)) { 110 VOP_UNLOCK(mp->mnt_vnodecovered, 0, td); 111 isvnunlocked = 1; 112 } 113 /* 114 * Find lower node 115 */ 116 NDINIT(ndp, LOOKUP, FOLLOW|WANTPARENT|LOCKLEAF, --- 285 unchanged lines hidden --- |