summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2011-10-24 20:41:31 +0000
committerpjd <pjd@FreeBSD.org>2011-10-24 20:41:31 +0000
commitce9569c79a3c73cf6c50abf55058648b73a23253 (patch)
treee7ac1b99bda7f955cd51694c6de8c6d36da5ca20 /sys
parentef9809129f92e1983f1058871db1227f48e0d676 (diff)
downloadFreeBSD-src-ce9569c79a3c73cf6c50abf55058648b73a23253.zip
FreeBSD-src-ce9569c79a3c73cf6c50abf55058648b73a23253.tar.gz
Don't forget to rename mounted snapshots of the file system being renamed.
MFC after: 2 weeks
Diffstat (limited to 'sys')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
index 2e57eab..c8f9bb9 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
@@ -2437,7 +2437,7 @@ zfsvfs_update_fromname(const char *oldname, const char *newname)
continue;
}
if (strncmp(fromname, oldname, oldlen) == 0 &&
- fromname[oldlen] == '/') {
+ (fromname[oldlen] == '/' || fromname[oldlen] == '@')) {
(void)snprintf(tmpbuf, sizeof(tmpbuf), "%s%s",
newname, fromname + oldlen);
(void)strlcpy(fromname, tmpbuf,
OpenPOWER on IntegriCloud