Date: Sat, 29 Jun 2013 23:15:46 +0000 (UTC) From: Steven Hartland <smh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r252390 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <201306292315.r5TNFk97050595@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: smh Date: Sat Jun 29 23:15:45 2013 New Revision: 252390 URL: http://svnweb.freebsd.org/changeset/base/252390 Log: Remove invalid ASSERT which causes a panic on zfs renames when run with ASSERTS. Removal was missed in merge of illumos 3464 (r248571) MFC after: 2 days Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Sat Jun 29 23:07:41 2013 (r252389) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c Sat Jun 29 23:15:45 2013 (r252390) @@ -1258,8 +1258,6 @@ dsl_dir_rename_sync(void *arg, dmu_tx_t int error; objset_t *mos = dp->dp_meta_objset; - ASSERT(dmu_buf_refcount(dd->dd_dbuf) <= 2); - VERIFY0(dsl_dir_hold(dp, ddra->ddra_oldname, FTAG, &dd, NULL)); VERIFY0(dsl_dir_hold(dp, ddra->ddra_newname, FTAG, &newparent, &mynewname));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306292315.r5TNFk97050595>