diff options
| author | mm <mm@FreeBSD.org> | 2010-09-15 19:55:26 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2010-09-15 19:55:26 +0000 |
| commit | 619300afba60531f5444ebe6322d9492fce9361d (patch) | |
| tree | 10d631120cb4e87e4c57fc165631b96818c04f03 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c | |
| parent | 1bb4df1f41a7b165af646cd4057f5a318e43eb88 (diff) | |
| download | FreeBSD-src-619300afba60531f5444ebe6322d9492fce9361d.zip FreeBSD-src-619300afba60531f5444ebe6322d9492fce9361d.tar.gz | |
Fix kernel panic when moving a file to .zfs/shares
Fix possible loss of correct error return code in ZFS mount
OpenSolaris revisions and Bug IDs:
11824:53128e5db7cf
6863610 ZFS mount can lose correct error return
12079:13822b941977
6939941 problem with moving files in zfs (142901-12)
Approved by: delphij (mentor)
Obtained from: OpenSolaris (Bug ID 6863610, 6939941)
MFC after: 3 days
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c index 156c1ee..48c3ebf 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c @@ -19,8 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. */ /* @@ -152,6 +151,17 @@ zfsctl_fini(void) { } +boolean_t +zfsctl_is_node(vnode_t *vp) +{ + return (vn_matchops(vp, zfsctl_ops_root) || + vn_matchops(vp, zfsctl_ops_snapdir) || + vn_matchops(vp, zfsctl_ops_snapshot) || + vn_matchops(vp, zfsctl_ops_shares) || + vn_matchops(vp, zfsctl_ops_shares_dir)); + +} + /* * Return the inode number associated with the 'snapshot' or * 'shares' directory. |
