summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2016-03-24 16:32:16 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2016-03-24 16:32:16 +0000
commitf6f36c00d6eec767d313ad396a83db1cb338328a (patch)
tree8d03b94f4dbc43f174687289ef0c45d1a5f35b7b /usr/src
parent4bbe81f0977c3edf0a0b743f9041ea25c7119ca1 (diff)
downloadillumos-joyent-f6f36c00d6eec767d313ad396a83db1cb338328a.tar.gz
4242 file rename event fires before the rename happens [fix mismerge]
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/uts/common/fs/tmpfs/tmp_vnops.c2
-rw-r--r--usr/src/uts/common/fs/udfs/udf_vnops.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/usr/src/uts/common/fs/tmpfs/tmp_vnops.c b/usr/src/uts/common/fs/tmpfs/tmp_vnops.c
index 254940a6a3..ad5600eeb7 100644
--- a/usr/src/uts/common/fs/tmpfs/tmp_vnops.c
+++ b/usr/src/uts/common/fs/tmpfs/tmp_vnops.c
@@ -1325,8 +1325,6 @@ tmp_rename(
done:
tmpnode_rele(fromtp);
- if (totp != NULL)
- tmpnode_rele(totp);
mutex_exit(&tm->tm_renamelck);
TRACE_5(TR_FAC_TMPFS, TR_TMPFS_RENAME,
diff --git a/usr/src/uts/common/fs/udfs/udf_vnops.c b/usr/src/uts/common/fs/udfs/udf_vnops.c
index 77ef3cecf4..7e17f16ce2 100644
--- a/usr/src/uts/common/fs/udfs/udf_vnops.c
+++ b/usr/src/uts/common/fs/udfs/udf_vnops.c
@@ -1038,8 +1038,6 @@ errout:
ITIMES(sdp);
ITIMES(tdp);
VN_RELE(ITOV(sip));
- if (tip != NULL)
- VN_RELE(ITOV(tip));
mutex_exit(&udf_vfsp->udf_rename_lck);
return (error);