From owner-svn-src-all@freebsd.org Sat Oct 26 19:12:10 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7241417DDE5; Sat, 26 Oct 2019 19:12:10 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-ot1-f49.google.com (mail-ot1-f49.google.com [209.85.210.49]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 470rFj4j6gz4X35; Sat, 26 Oct 2019 19:12:09 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-ot1-f49.google.com with SMTP id 94so4258949oty.8; Sat, 26 Oct 2019 12:12:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Yi0JN2o4i86NL+YaFGIAI2SSyoZt5F9u6aiN1Jv6eGk=; b=Bc+bqqt6CtHFh7VhlYXNMi1mWL0mXnRTtRjcwIsXEni2Y4yMJ6SYTbZ90zxSZMfkxd O63Rkq5vffClHsAIxvHTUUHaXhdSzNDSzoo56xBejlfdmFiuJbMtAY5pSwUHyBYQGal+ LzIklWiy9UU4Dx1B/c840SaAdM4bqzeC1AVF+/d6n36CfXvycoDUGSJgP7DQ3c9isvsP X1Gzk4WyNx36IaYC2jyuUwqJn+NCmtrMGmAzjHQqTeQcbrno3tM+N3a9uuWOsElfqx3v ml+C4X+Q0Fp2ws4B43S9RjAxO/7Ys5rDfdD3AcrK6TbTgy/dxpy8/rJZGOqavpZ2x03z dbqQ== X-Gm-Message-State: APjAAAW/LK229HTEB4wY8CJjCJDPIhpYzofehROVn/VnroFKT6Y/YycE KbZB0eGFkFP4fW4gmCPcrx3evReSUnyhOMFdA4mvl0zU X-Google-Smtp-Source: APXvYqz6EMQVgSUhr+gbiaEwG6R9EDjqJMw7YVbTfjD4B8U8YC0pB8iRXmaip/IYSXofwbQiG61K3Su42fVaJL9ebmw= X-Received: by 2002:a9d:5f0f:: with SMTP id f15mr7314245oti.251.1572117127979; Sat, 26 Oct 2019 12:12:07 -0700 (PDT) MIME-Version: 1.0 References: <201910261711.x9QHB308040398@repo.freebsd.org> In-Reply-To: From: Alan Somers Date: Sat, 26 Oct 2019 13:11:56 -0600 Message-ID: Subject: Re: svn commit: r354116 - in head: cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/lib/libzfs/common sys/cddl/contrib/opensolaris/uts/common/fs/zfs sys/cddl/contrib/opensolaris/uts/common/sys/fs To: Dan Mack Cc: src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 470rFj4j6gz4X35 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of asomers@gmail.com designates 209.85.210.49 as permitted sender) smtp.mailfrom=asomers@gmail.com X-Spamd-Result: default: False [-2.12 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DMARC_NA(0.00)[freebsd.org]; URI_COUNT_ODD(1.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[49.210.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.12)[ip: (-0.26), ipnet: 209.85.128.0/17(-3.22), asn: 15169(-2.05), country: US(-0.05)]; FORGED_SENDER(0.30)[asomers@freebsd.org,asomers@gmail.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[asomers@freebsd.org,asomers@gmail.com]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Oct 2019 19:12:10 -0000 Ack, my bad. Fix coming... On Sat, Oct 26, 2019 at 12:37 PM Dan Mack wrote: > > This appears to have broken my buildworld unless I did something wrong on > my end: Last Changed Rev: 354116 > > > snip ... > > ===> lib/ofed/libibumad (all) > --- all_subdir_lib/libbe --- > /usr/src/lib/libbe/be_info.c:260:67: error: too few arguments to function > call, expected 5, have 3 > return (zfs_iter_snapshots_sorted(hdl, prop_list_builder_cb, > data)); > ~~~~~~~~~~~~~~~~~~~~~~~~~ ^ > /usr/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h:575:1: note: > 'zfs_iter_snapshots_sorted' declared here > extern int zfs_iter_snapshots_sorted(zfs_handle_t *, zfs_iter_f, void *, > ^ > 1 error generated. > *** [be_info.o] Error code 1 > > On Sat, 26 Oct 2019, Alan Somers wrote: > > > Author: asomers > > Date: Sat Oct 26 17:11:02 2019 > > New Revision: 354116 > > URL: https://svnweb.freebsd.org/changeset/base/354116 > > > > Log: > > MFZoL: Avoid retrieving unused snapshot props > > > > This patch modifies the zfs_ioc_snapshot_list_next() ioctl to enable it > > to take input parameters that alter the way looping through the list of > > snapshots is performed. The idea here is to restrict functions that > > throw away some of the snapshots returned by the ioctl to a range of > > snapshots that these functions actually use. This improves efficiency > > and execution speed for some rollback and send operations. > > > > Reviewed-by: Tom Caputi > > Reviewed-by: Brian Behlendorf > > Reviewed by: Matt Ahrens > > Signed-off-by: Alek Pinchuk > > Closes #8077 > > zfsonlinux/zfs@4c0883fb4af0d5565459099b98fcf90ecbfa1ca1 > > > > MFC after: 2 weeks > > > > Modified: > > head/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c > > head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c > > head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h > > head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c > > head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c > > head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c > > head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c > > head/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h > >