summaryrefslogtreecommitdiffstats
path: root/sys/cddl
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2015-01-01 10:44:20 +0000
committerkib <kib@FreeBSD.org>2015-01-01 10:44:20 +0000
commita355201d21e09aeb2af52ffd0c14f90c6c9f338b (patch)
treea2f3efb3e775ec1f6c79f59d8d5d807106d8256b /sys/cddl
parent366f16dd6a08d1eeca56a868ab58114d5d5d2069 (diff)
downloadFreeBSD-src-a355201d21e09aeb2af52ffd0c14f90c6c9f338b.zip
FreeBSD-src-a355201d21e09aeb2af52ffd0c14f90c6c9f338b.tar.gz
MFC r275897:
Set NOCACHE flag for CREATE namei() calls, do not specially handle MAKEENTRY in VOP_LOOKUP().
Diffstat (limited to 'sys/cddl')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
index 504c130..8c3a910 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
@@ -1538,7 +1538,7 @@ zfs_lookup(vnode_t *dvp, char *nm, vnode_t **vpp, struct componentname *cnp,
/*
* Insert name into cache (as non-existent) if appropriate.
*/
- if (error == ENOENT && (cnp->cn_flags & MAKEENTRY) && nameiop != CREATE)
+ if (error == ENOENT && (cnp->cn_flags & MAKEENTRY) != 0)
cache_enter(dvp, *vpp, cnp);
/*
* Insert name into cache if appropriate.
OpenPOWER on IntegriCloud