diff options
| author | delphij <delphij@FreeBSD.org> | 2010-01-02 23:38:03 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2010-01-02 23:38:03 +0000 |
| commit | 682c0944eb643a64db9c9279bfd17d6767a6bd3d (patch) | |
| tree | 3236a5a7eb7af99b90cc73dda09096d8a17b861a /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c | |
| parent | a922794e92f1d71cc8cce3b0a28fb257186744f8 (diff) | |
| download | FreeBSD-src-682c0944eb643a64db9c9279bfd17d6767a6bd3d.zip FreeBSD-src-682c0944eb643a64db9c9279bfd17d6767a6bd3d.tar.gz | |
Reduce diff against OpenSolaris - move Giant acquire/release to
zfs_znode.c. As a side effect this also eliminates two potential
Giant leaks.
Approved by: pjd
MFC after: 1 month
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c index 10d3b86..77511bd 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c @@ -557,9 +557,6 @@ zfs_rmnode(znode_t *zp) dmu_tx_t *tx; uint64_t acl_obj; int error; - int vfslocked; - - vfslocked = VFS_LOCK_GIANT(zfsvfs->z_vfs); ASSERT(zp->z_phys->zp_links == 0); @@ -593,7 +590,6 @@ zfs_rmnode(znode_t *zp) */ zfs_znode_dmu_fini(zp); zfs_znode_free(zp); - VFS_UNLOCK_GIANT(vfslocked); return; } } @@ -666,7 +662,6 @@ zfs_rmnode(znode_t *zp) out: if (xzp) VN_RELE(ZTOV(xzp)); - VFS_UNLOCK_GIANT(vfslocked); } static uint64_t |
