summaryrefslogtreecommitdiffstats
path: root/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2014-03-20 00:28:53 +0000
committerdelphij <delphij@FreeBSD.org>2014-03-20 00:28:53 +0000
commitec5d67aa46e2c8259141fe7898d67f24a6f1bda6 (patch)
treedddfb59ee71d89633288f659589644655a5f227d /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
parent11b0e21c7539d9eb21846d2b962f24a3c1716d01 (diff)
downloadFreeBSD-src-ec5d67aa46e2c8259141fe7898d67f24a6f1bda6.zip
FreeBSD-src-ec5d67aa46e2c8259141fe7898d67f24a6f1bda6.tar.gz
MFC r260183: MFV r260154 + 260182:
4369 implement zfs bookmarks 4368 zfs send filesystems from readonly pools Illumos/illumos-gate@78f171005391b928aaf1642b3206c534ed644332
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
index 2a56333..dbcb729 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
@@ -483,7 +483,7 @@ spa_lookup(const char *name)
* If it's a full dataset name, figure out the pool name and
* just use that.
*/
- cp = strpbrk(search.spa_name, "/@");
+ cp = strpbrk(search.spa_name, "/@#");
if (cp != NULL)
*cp = '\0';
OpenPOWER on IntegriCloud