c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-13 19:50:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Removed erroneous zfs_inode_destroy() calls from zfs_rmnode().

Browse Source 
iput_final() already calls zpl_inode_destroy() -> zfs_inode_destroy()
for us after zfs_zinactive(), thus making sure that the inode is
properly cleaned up.

The zfs_inode_destroy() calls in zfs_rmnode() would lead to a
double-free.

Fixes #282
This commit is contained in:
Gunnar Beutner 2011-06-16 20:59:56 +02:00 committed by Brian Behlendorf
parent df30f56639
commit 6f0cf71e0d
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
module/zfs/zfs_dir.c
View File

@ -614,7 +614,6 @@ zfs_rmnode(znode_t *zp)
* Leave it in the unlinked set. * Leave it in the unlinked set.
*/ */
zfs_znode_dmu_fini(zp); zfs_znode_dmu_fini(zp);
zfs_inode_destroy(ZTOI(zp));
return; return;
} }
@ -629,7 +628,6 @@ zfs_rmnode(znode_t *zp)
* Not enough space. Leave the file in the unlinked set. * Not enough space. Leave the file in the unlinked set.
*/ */
zfs_znode_dmu_fini(zp); zfs_znode_dmu_fini(zp);
zfs_inode_destroy(ZTOI(zp));
return; return;
} }
@ -669,7 +667,6 @@ zfs_rmnode(znode_t *zp)
*/ */
dmu_tx_abort(tx); dmu_tx_abort(tx);
zfs_znode_dmu_fini(zp); zfs_znode_dmu_fini(zp);
zfs_inode_destroy(ZTOI(zp));
goto out; goto out;
} }