Date: Wed, 26 Jul 2017 16:53:40 +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: r321561 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <201707261653.v6QGrepS081398@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Wed Jul 26 16:53:39 2017 New Revision: 321561 URL: https://svnweb.freebsd.org/changeset/base/321561 Log: MFC r318923: zfs_putpages: assert that sa_bulk_update() must succeed Same as the upstream does in r316927. Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Wed Jul 26 16:52:24 2017 (r321560) +++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Wed Jul 26 16:53:39 2017 (r321561) @@ -4757,7 +4757,8 @@ zfs_putpages(struct vnode *vp, vm_page_t *ma, size_t l &zp->z_pflags, 8); zfs_tstamp_update_setup(zp, CONTENT_MODIFIED, mtime, ctime, B_TRUE); - (void)sa_bulk_update(zp->z_sa_hdl, bulk, count, tx); + err = sa_bulk_update(zp->z_sa_hdl, bulk, count, tx); + ASSERT0(err); zfs_log_write(zfsvfs->z_log, tx, TX_WRITE, zp, off, len, 0); zfs_vmobject_wlock(object);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707261653.v6QGrepS081398>