summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2017-06-01 11:47:56 +0000
committeravg <avg@FreeBSD.org>2017-06-01 11:47:56 +0000
commitaae59ee4e4b5e9565344c36b9a8d18c6d9982ae7 (patch)
tree62832ca1d76567807fb79edc2f6f2fbd9fd172e7
parentc5ed50cbb819bcac3a2b8deb80c7b5ad14b32746 (diff)
downloadFreeBSD-src-aae59ee4e4b5e9565344c36b9a8d18c6d9982ae7.zip
FreeBSD-src-aae59ee4e4b5e9565344c36b9a8d18c6d9982ae7.tar.gz
MFC r319096: zfs_lookup: fix bogus arguments to lookup of "snapshot" directory
-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 56825a8..17819bc 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
@@ -1625,7 +1625,7 @@ zfs_lookup(vnode_t *dvp, char *nm, vnode_t **vpp, struct componentname *cnp,
cn.cn_nameptr = "snapshot";
cn.cn_namelen = strlen(cn.cn_nameptr);
cn.cn_nameiop = cnp->cn_nameiop;
- cn.cn_flags = cnp->cn_flags;
+ cn.cn_flags = cnp->cn_flags & ~ISDOTDOT;
cn.cn_lkflags = cnp->cn_lkflags;
error = VOP_LOOKUP(zfsctl_vp, vpp, &cn);
vput(zfsctl_vp);
OpenPOWER on IntegriCloud