aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndriy Gapon <avg@FreeBSD.org>2012-11-04 14:50:08 +0000
committerAndriy Gapon <avg@FreeBSD.org>2012-11-04 14:50:08 +0000
commit2c6024ec1b5e24880f3a1643f90d68321e9ade7f (patch)
tree103e5852a908909ae6e8135437cdf3d4445f2530
parent5c997cc4294d90719420bbb0ff89dc21c88ae699 (diff)
Notes
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c14
1 files changed, 14 insertions, 0 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 6ff93395f7c2..9ef5e39622c5 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
@@ -374,8 +374,15 @@ zfs_dirlook(znode_t *dzp, char *name, vnode_t **vpp, int flags,
znode_t *zp;
int error = 0;
uint64_t parent;
+ int unlinked;
if (name[0] == 0 || (name[0] == '.' && name[1] == 0)) {
+ mutex_enter(&dzp->z_lock);
+ unlinked = dzp->z_unlinked;
+ mutex_exit(&dzp->z_lock);
+ if (unlinked)
+ return (ENOENT);
+
*vpp = ZTOV(dzp);
VN_HOLD(*vpp);
} else if (name[0] == '.' && name[1] == '.' && name[2] == 0) {
@@ -394,6 +401,13 @@ zfs_dirlook(znode_t *dzp, char *name, vnode_t **vpp, int flags,
NULL, NULL, NULL);
return (error);
}
+
+ mutex_enter(&dzp->z_lock);
+ unlinked = dzp->z_unlinked;
+ mutex_exit(&dzp->z_lock);
+ if (unlinked)
+ return (ENOENT);
+
rw_enter(&dzp->z_parent_lock, RW_READER);
error = zfs_zget(zfsvfs, parent, &zp);
if (error == 0)