blob: fc25765f1513690f170e24f445f66776d5dd12f1 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c.orig
+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
@@ -1155,15 +1155,27 @@
*/
ASSERT3P(zp, !=, NULL);
ASSERT3U(zp->z_id, ==, obj_num);
- *zpp = zp;
- vp = ZTOV(zp);
-
- /* Don't let the vnode disappear after ZFS_OBJ_HOLD_EXIT. */
- VN_HOLD(vp);
+ if (zp->z_unlinked) {
+ err = SET_ERROR(ENOENT);
+ } else {
+ vp = ZTOV(zp);
+ /*
+ * Don't let the vnode disappear after
+ * ZFS_OBJ_HOLD_EXIT.
+ */
+ VN_HOLD(vp);
+ *zpp = zp;
+ err = 0;
+ }
sa_buf_rele(db, NULL);
ZFS_OBJ_HOLD_EXIT(zfsvfs, obj_num);
+ if (err) {
+ getnewvnode_drop_reserve();
+ return (err);
+ }
+
locked = VOP_ISLOCKED(vp);
VI_LOCK(vp);
if ((vp->v_iflag & VI_DOOMED) != 0 &&
@@ -1196,7 +1208,7 @@
}
VI_UNLOCK(vp);
getnewvnode_drop_reserve();
- return (0);
+ return (err);
}
/*
|
