From owner-svn-soc-all@freebsd.org Thu Nov 9 15:53:25 2017 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D135EE54186 for ; Thu, 9 Nov 2017 15:53:25 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B6E2D6BD53 for ; Thu, 9 Nov 2017 15:53:25 +0000 (UTC) (envelope-from allanjude@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id vA9FrPLH011591 for ; Thu, 9 Nov 2017 15:53:25 GMT (envelope-from allanjude@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id vA9FrOjs011544 for svn-soc-all@FreeBSD.org; Thu, 9 Nov 2017 15:53:24 GMT (envelope-from allanjude@FreeBSD.org) Date: Thu, 9 Nov 2017 15:53:24 GMT Message-Id: <201711091553.vA9FrOjs011544@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to allanjude@FreeBSD.org using -f From: allanjude@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r329236 - soc2017/kneitinger/libbe-head/lib/libbe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2017 15:53:25 -0000 Author: allanjude Date: Thu Nov 9 15:53:24 2017 New Revision: 329236 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=329236 Log: Extend the API to allow snapshots to be created recursively Modified: soc2017/kneitinger/libbe-head/lib/libbe/be.c soc2017/kneitinger/libbe-head/lib/libbe/be.h Modified: soc2017/kneitinger/libbe-head/lib/libbe/be.c ============================================================================== --- soc2017/kneitinger/libbe-head/lib/libbe/be.c Thu Nov 9 15:48:35 2017 (r329235) +++ soc2017/kneitinger/libbe-head/lib/libbe/be.c Thu Nov 9 15:53:24 2017 (r329236) @@ -186,7 +186,8 @@ int -be_snapshot(libbe_handle_t *lbh, char *source, char *snap_name, char *result) +be_snapshot(libbe_handle_t *lbh, char *source, char *snap_name, + bool recursive, char *result) { char buf[BE_MAXPATHLEN]; time_t rawtime; @@ -215,7 +216,7 @@ } } - if (err = zfs_snapshot(lbh->lzh, buf, false, NULL) != 0) { + if (err = zfs_snapshot(lbh->lzh, buf, recursive, NULL) != 0) { switch (err) { case EZFS_INVALIDNAME: return (set_error(lbh, BE_ERR_INVALIDNAME)); @@ -580,7 +581,7 @@ zfs_handle_t *zfs; int err; - if (err = be_snapshot(lbh, bootenv, NULL, snap_name)) { + if (err = be_snapshot(lbh, bootenv, NULL, true, snap_name)) { // TODO error handle return (-1); } Modified: soc2017/kneitinger/libbe-head/lib/libbe/be.h ============================================================================== --- soc2017/kneitinger/libbe-head/lib/libbe/be.h Thu Nov 9 15:48:35 2017 (r329235) +++ soc2017/kneitinger/libbe-head/lib/libbe/be.h Thu Nov 9 15:53:24 2017 (r329236) @@ -71,7 +71,7 @@ int be_create(libbe_handle_t *, char *); int be_create_from_existing(libbe_handle_t *, char *, char *); int be_create_from_existing_snap(libbe_handle_t *, char *, char *); -int be_snapshot(libbe_handle_t *, char *, char *, char *); +int be_snapshot(libbe_handle_t *, char *, char *, bool, char *); /* Bootenv manipulation functions */ int be_rename(libbe_handle_t *, char *, char *);