From 9abdb28b475388d968be2b6d9dc1f6f7a3c61373 Mon Sep 17 00:00:00 2001 From: kib Date: Fri, 9 Apr 2010 08:39:28 +0000 Subject: [PATCH] MFC r206093: Add function vop_rename_fail(9) that performs needed cleanup for locks and references of the VOP_RENAME(9) arguments. Use vop_rename_fail() in deadfs_rename(). git-svn-id: svn://svn.freebsd.org/base/stable/8@206413 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/fs/deadfs/dead_vnops.c | 10 ++-------- sys/kern/vfs_subr.c | 14 ++++++++++++++ sys/sys/vnode.h | 2 ++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c index 7a07b3854..e2556543f 100644 --- a/sys/fs/deadfs/dead_vnops.c +++ b/sys/fs/deadfs/dead_vnops.c @@ -225,13 +225,7 @@ dead_rename(ap) struct componentname *a_tcnp; } */ *ap; { - if (ap->a_tvp) - vput(ap->a_tvp); - if (ap->a_tdvp == ap->a_tvp) - vrele(ap->a_tdvp); - else - vput(ap->a_tdvp); - vrele(ap->a_fdvp); - vrele(ap->a_fvp); + + vop_rename_fail(ap); return (EXDEV); } diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index cf73dff04..51ec34e8b 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -3748,6 +3748,20 @@ assert_vop_slocked(struct vnode *vp, const char *str) #endif /* 0 */ #endif /* DEBUG_VFS_LOCKS */ +void +vop_rename_fail(struct vop_rename_args *ap) +{ + + if (ap->a_tvp != NULL) + vput(ap->a_tvp); + if (ap->a_tdvp == ap->a_tvp) + vrele(ap->a_tdvp); + else + vput(ap->a_tdvp); + vrele(ap->a_fdvp); + vrele(ap->a_fvp); +} + void vop_rename_pre(void *ap) { diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 4c84ea30e..b5784e4a7 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -720,6 +720,8 @@ void vop_symlink_post(void *a, int rc); void vop_unlock_post(void *a, int rc); void vop_unlock_pre(void *a); +void vop_rename_fail(struct vop_rename_args *ap); + #define VOP_WRITE_PRE(ap) \ struct vattr va; \ int error, osize, ooffset, noffset; \ -- 2.45.0