svn commit: r321526 - stable/11/sys/boot/zfs

Alexander Motin mav at FreeBSD.org
Wed Jul 26 15:52:53 UTC 2017


Author: mav
Date: Wed Jul 26 15:52:51 2017
New Revision: 321526
URL: https://svnweb.freebsd.org/changeset/base/321526

Log:
  Fix mismerge in r321525.

Modified:
  stable/11/sys/boot/zfs/zfsimpl.c

Modified: stable/11/sys/boot/zfs/zfsimpl.c
==============================================================================
--- stable/11/sys/boot/zfs/zfsimpl.c	Wed Jul 26 15:29:56 2017	(r321525)
+++ stable/11/sys/boot/zfs/zfsimpl.c	Wed Jul 26 15:52:51 2017	(r321526)
@@ -2234,7 +2234,7 @@ zfs_lookup(const struct zfsmount *mount, const char *u
 		return (rc);
 	}
 
-	rc = zap_lookup(spa, &dn, ZFS_ROOT_OBJ, &rootnum);
+	rc = zap_lookup(spa, &dn, ZFS_ROOT_OBJ, &objnum);
 	if (rc) {
 		free(entry);
 		return (rc);


More information about the svn-src-stable-11 mailing list