svn commit: r226700 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

Pawel Jakub Dawidek pjd at FreeBSD.org
Mon Oct 24 20:41:33 UTC 2011


Author: pjd
Date: Mon Oct 24 20:41:31 2011
New Revision: 226700
URL: http://svn.freebsd.org/changeset/base/226700

Log:
  Don't forget to rename mounted snapshots of the file system being renamed.
  
  MFC after:	2 weeks

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	Mon Oct 24 20:26:37 2011	(r226699)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c	Mon Oct 24 20:41:31 2011	(r226700)
@@ -2437,7 +2437,7 @@ zfsvfs_update_fromname(const char *oldna
 			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,


More information about the svn-src-all mailing list