Page MenuHomeFreeBSD
Files F165331695

D33008.id99680.diff
No OneTemporary
Actions

D33008.id99680.diff
View Options

diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h
--- a/sys/fs/unionfs/union.h
+++ b/sys/fs/unionfs/union.h
@@ -130,9 +130,8 @@
int unionfs_init(struct vfsconf *);
int unionfs_uninit(struct vfsconf *);
int unionfs_nodeget(struct mount *, struct vnode *, struct vnode *,
- struct vnode *, struct vnode **, struct componentname *,
- struct thread *);
-void unionfs_noderem(struct vnode *, struct thread *);
+ struct vnode *, struct vnode **, struct componentname *);
+void unionfs_noderem(struct vnode *);
void unionfs_get_node_status(struct unionfs_node *, struct thread *,
struct unionfs_node_status **);
void unionfs_tryrem_node_status(struct unionfs_node *,
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -299,7 +299,7 @@
int
unionfs_nodeget(struct mount *mp, struct vnode *uppervp,
struct vnode *lowervp, struct vnode *dvp, struct vnode **vpp,
- struct componentname *cnp, struct thread *td)
+ struct componentname *cnp)
{
char *path;
struct unionfs_mount *ump;
@@ -426,7 +426,7 @@
* Clean up the unionfs node.
*/
void
-unionfs_noderem(struct vnode *vp, struct thread *td)
+unionfs_noderem(struct vnode *vp)
{
struct unionfs_node *unp, *unp_t1, *unp_t2;
struct unionfs_node_hashhead *hd;
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -78,7 +78,6 @@
struct vnode *lowerrootvp;
struct vnode *upperrootvp;
struct unionfs_mount *ump;
- struct thread *td;
char *target;
char *tmp;
char *ep;
@@ -105,7 +104,6 @@
copymode = UNIONFS_TRANSPARENT; /* default */
whitemode = UNIONFS_WHITE_ALWAYS;
ndp = &nd;
- td = curthread;
if (mp->mnt_flag & MNT_ROOTFS) {
vfs_mount_error(mp, "Cannot union mount root filesystem");
@@ -284,7 +282,7 @@
* Get the unionfs root vnode.
*/
error = unionfs_nodeget(mp, ump->um_uppervp, ump->um_lowervp,
- NULLVP, &(ump->um_rootvp), NULL, td);
+ NULLVP, &(ump->um_rootvp), NULL);
vrele(upperrootvp);
if (error != 0) {
free(ump, M_UNIONFSMNT);
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -263,7 +263,7 @@
(1 < cnp->cn_namelen || '.' != *(cnp->cn_nameptr))) {
/* get unionfs vnode in order to create a new shadow dir. */
error = unionfs_nodeget(dvp->v_mount, NULLVP, lvp, dvp, &vp,
- cnp, td);
+ cnp);
if (error != 0)
goto unionfs_lookup_cleanup;
@@ -319,7 +319,7 @@
*/
else
error = unionfs_nodeget(dvp->v_mount, uvp, lvp,
- dvp, &vp, cnp, td);
+ dvp, &vp, cnp);
if (error != 0) {
UNIONFSDEBUG(
"unionfs_lookup: Unable to create unionfs vnode.");
@@ -383,7 +383,7 @@
else {
VOP_UNLOCK(vp);
error = unionfs_nodeget(ap->a_dvp->v_mount, vp, NULLVP,
- ap->a_dvp, ap->a_vpp, cnp, curthread);
+ ap->a_dvp, ap->a_vpp, cnp);
vrele(vp);
}
}
@@ -457,7 +457,7 @@
else {
VOP_UNLOCK(vp);
error = unionfs_nodeget(ap->a_dvp->v_mount, vp, NULLVP,
- ap->a_dvp, ap->a_vpp, cnp, curthread);
+ ap->a_dvp, ap->a_vpp, cnp);
vrele(vp);
}
}
@@ -1347,7 +1347,6 @@
{
struct unionfs_node *dunp;
struct componentname *cnp;
- struct thread *td;
struct vnode *udvp;
struct vnode *uvp;
struct vattr va;
@@ -1362,7 +1361,6 @@
dunp = VTOUNIONFS(ap->a_dvp);
cnp = ap->a_cnp;
lkflags = cnp->cn_lkflags;
- td = curthread;
udvp = dunp->un_uppervp;
if (udvp != NULLVP) {
@@ -1379,7 +1377,7 @@
VOP_UNLOCK(uvp);
cnp->cn_lkflags = LK_EXCLUSIVE;
error = unionfs_nodeget(ap->a_dvp->v_mount, uvp, NULLVP,
- ap->a_dvp, ap->a_vpp, cnp, td);
+ ap->a_dvp, ap->a_vpp, cnp);
cnp->cn_lkflags = lkflags;
vrele(uvp);
}
@@ -1467,7 +1465,6 @@
{
struct unionfs_node *dunp;
struct componentname *cnp;
- struct thread *td;
struct vnode *udvp;
struct vnode *uvp;
int error;
@@ -1481,7 +1478,6 @@
dunp = VTOUNIONFS(ap->a_dvp);
cnp = ap->a_cnp;
lkflags = cnp->cn_lkflags;
- td = curthread;
udvp = dunp->un_uppervp;
if (udvp != NULLVP) {
@@ -1490,7 +1486,7 @@
VOP_UNLOCK(uvp);
cnp->cn_lkflags = LK_EXCLUSIVE;
error = unionfs_nodeget(ap->a_dvp->v_mount, uvp, NULLVP,
- ap->a_dvp, ap->a_vpp, cnp, td);
+ ap->a_dvp, ap->a_vpp, cnp);
cnp->cn_lkflags = lkflags;
vrele(uvp);
}
@@ -1761,7 +1757,7 @@
{
/* UNIONFS_INTERNAL_DEBUG("unionfs_reclaim: enter\n"); */
- unionfs_noderem(ap->a_vp, curthread);
+ unionfs_noderem(ap->a_vp);
/* UNIONFS_INTERNAL_DEBUG("unionfs_reclaim: leave\n"); */

File Metadata

Mime Type
text/plain
Expires
Sat, Aug 8, 4:47 PM (21 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36241938
Default Alt Text
D33008.id99680.diff (4 KB)

Event Timeline