d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make cd9660 filesystem PDIRUNLOCK aware. Now it can be used in vnode stacks

Browse Source 
and nullfs mounts.

Remove now unnecessary i_lock field from the iso_node structure.
This commit is contained in:
Boris Popov 2000-10-03 04:39:50 +00:00
parent 611025ec57
commit beafe997c7
8 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/fs/cd9660/cd9660_lookup.c
View File

@ -129,6 +129,7 @@ cd9660_lookup(ap)
imp = dp->i_mnt;
lockparent = flags & LOCKPARENT;
wantparent = flags & (LOCKPARENT|WANTPARENT);
cnp->cn_flags &= ~PDIRUNLOCK;
/*
* We now have a segment name to search for, and a directory to search.
@ -358,11 +359,14 @@ found:
vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY, p);
return (error);
}
if (lockparent && (flags & ISLASTCN) &&
(error = vn_lock(pdp, LK_EXCLUSIVE, p))) {
vput(tdp);
return (error);
}
if (lockparent && (flags & ISLASTCN)) {
if ((error = vn_lock(pdp, LK_EXCLUSIVE, p)) != 0) {
cnp->cn_flags |= PDIRUNLOCK;
vput(tdp);
return (error);
}
} else
cnp->cn_flags |= PDIRUNLOCK;
*vpp = tdp;
} else if (dp->i_number == dp->i_ino) {
brelse(bp);
@ -374,8 +378,10 @@ found:
brelse(bp);
if (error)
return (error);
if (!lockparent || !(flags & ISLASTCN))
if (!lockparent || !(flags & ISLASTCN)) {
cnp->cn_flags |= PDIRUNLOCK;
VOP_UNLOCK(pdp, 0, p);
}
*vpp = tdp;
}

2
sys/fs/cd9660/cd9660_node.c
View File

@ -138,7 +138,7 @@ cd9660_ihashins(ip)
*ipp = ip;
simple_unlock(&cd9660_ihash_slock);
lockmgr(&ip->i_lock, LK_EXCLUSIVE, (struct simplelock *)0, p);
lockmgr(&ip->i_vnode->v_lock, LK_EXCLUSIVE, (struct simplelock *)0, p);
}
/*

1
sys/fs/cd9660/cd9660_node.h
View File

@ -61,7 +61,6 @@ typedef struct {
struct iso_node {
struct lock i_lock; /* node lock > Keep this first< */
struct iso_node *i_next, **i_prev; /* hash chain */
struct vnode *i_vnode; /* vnode associated with this inode */
struct vnode *i_devvp; /* vnode for block I/O */

6
sys/fs/cd9660/cd9660_vfsops.c
View File

@ -725,7 +725,11 @@ cd9660_vget_internal(mp, ino, vpp, relocated, isodir)
MALLOC(ip, struct iso_node *, sizeof(struct iso_node), M_ISOFSNODE,
M_WAITOK);
bzero((caddr_t)ip, sizeof(struct iso_node));
lockinit(&ip->i_lock, PINOD, "isonode", 0, 0);
lockinit(&vp->v_lock, PINOD, "isonode", 0, 0);
/*
* ISOFS uses stdlock and can share lock structure
*/
vp->v_vnlock = &vp->v_lock;
vp->v_data = ip;
ip->i_vnode = vp;
ip->i_dev = dev;

18
sys/isofs/cd9660/cd9660_lookup.c
View File

@ -129,6 +129,7 @@ cd9660_lookup(ap)
imp = dp->i_mnt;
lockparent = flags & LOCKPARENT;
wantparent = flags & (LOCKPARENT|WANTPARENT);
cnp->cn_flags &= ~PDIRUNLOCK;
/*
* We now have a segment name to search for, and a directory to search.
@ -358,11 +359,14 @@ found:
vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY, p);
return (error);
}
if (lockparent && (flags & ISLASTCN) &&
(error = vn_lock(pdp, LK_EXCLUSIVE, p))) {
vput(tdp);
return (error);
}
if (lockparent && (flags & ISLASTCN)) {
if ((error = vn_lock(pdp, LK_EXCLUSIVE, p)) != 0) {
cnp->cn_flags |= PDIRUNLOCK;
vput(tdp);
return (error);
}
} else
cnp->cn_flags |= PDIRUNLOCK;
*vpp = tdp;
} else if (dp->i_number == dp->i_ino) {
brelse(bp);
@ -374,8 +378,10 @@ found:
brelse(bp);
if (error)
return (error);
if (!lockparent || !(flags & ISLASTCN))
if (!lockparent || !(flags & ISLASTCN)) {
cnp->cn_flags |= PDIRUNLOCK;
VOP_UNLOCK(pdp, 0, p);
}
*vpp = tdp;
}

2
sys/isofs/cd9660/cd9660_node.c
View File

@ -138,7 +138,7 @@ cd9660_ihashins(ip)
*ipp = ip;
simple_unlock(&cd9660_ihash_slock);
lockmgr(&ip->i_lock, LK_EXCLUSIVE, (struct simplelock *)0, p);
lockmgr(&ip->i_vnode->v_lock, LK_EXCLUSIVE, (struct simplelock *)0, p);
}
/*

1
sys/isofs/cd9660/cd9660_node.h
View File

@ -61,7 +61,6 @@ typedef struct {
struct iso_node {
struct lock i_lock; /* node lock > Keep this first< */
struct iso_node *i_next, **i_prev; /* hash chain */
struct vnode *i_vnode; /* vnode associated with this inode */
struct vnode *i_devvp; /* vnode for block I/O */

6
sys/isofs/cd9660/cd9660_vfsops.c
View File

@ -725,7 +725,11 @@ cd9660_vget_internal(mp, ino, vpp, relocated, isodir)
MALLOC(ip, struct iso_node *, sizeof(struct iso_node), M_ISOFSNODE,
M_WAITOK);
bzero((caddr_t)ip, sizeof(struct iso_node));
lockinit(&ip->i_lock, PINOD, "isonode", 0, 0);
lockinit(&vp->v_lock, PINOD, "isonode", 0, 0);
/*
* ISOFS uses stdlock and can share lock structure
*/
vp->v_vnlock = &vp->v_lock;
vp->v_data = ip;
ip->i_vnode = vp;
ip->i_dev = dev;