Date: Wed, 26 Jul 2017 15:52:51 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r321526 - stable/11/sys/boot/zfs Message-ID: <201707261552.v6QFqpMh055115@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707261552.v6QFqpMh055115>