Date: Sun, 9 Aug 2015 20:29:26 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r286552 - vendor-sys/illumos/dist/uts/common/fs/zfs Message-ID: <201508092029.t79KTQ98020631@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Sun Aug 9 20:29:25 2015 New Revision: 286552 URL: https://svnweb.freebsd.org/changeset/base/286552 Log: 5770 Add load_nvlist() error handling Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: George Wilson <george@delphix.com> Reviewed by: Prakash Surya <prakash.surya@delphix.com> Reviewed by: Richard Elling <richard.elling@richardelling.com> Reviewed by: Richard PALO <richard@NetBSD.org> Approved by: Richard Lowe <richlowe@richlowe.net> Author: Brian Behlendorf <behlendorf1@llnl.gov> illumos/illumos-gate@a45f1c3c5ee26f908655e7762d7e1e2aecdfefbc Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c Sun Aug 9 20:23:35 2015 (r286551) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c Sun Aug 9 20:29:25 2015 (r286552) @@ -1575,7 +1575,10 @@ load_nvlist(spa_t *spa, uint64_t obj, nv int error; *value = NULL; - VERIFY(0 == dmu_bonus_hold(spa->spa_meta_objset, obj, FTAG, &db)); + error = dmu_bonus_hold(spa->spa_meta_objset, obj, FTAG, &db); + if (error != 0) + return (error); + nvsize = *(uint64_t *)db->db_data; dmu_buf_rele(db, FTAG);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508092029.t79KTQ98020631>