mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-19 10:53:58 +00:00
Code Issues Releases Activity

libbe(3): Add a destroy option for removing the origin

Browse Source 
Currently origin snapshots are left behind when a BE is destroyed, whether
it was an auto-created snapshot or explicitly specified via, for example,
`bectl create -e be@mysnap ...`.

Removing it automatically could be argued as a POLA violation in some
circumstances, so provide a flag to be_destroy for it. An accompanying
option will be added to bectl(8) to utilize this.

Some minor style/consistency nits in the affected areas also addressed.

Reported by:	Shawn Webb
MFC after:	1 week
This commit is contained in:
Kyle Evans 2019-02-10 21:19:09 +00:00
parent dcbd7de5b6
commit 13c62c50e3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=343977
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/libbe/be.c
View File

@ -203,13 +203,14 @@ be_destroy_cb(zfs_handle_t *zfs_hdl, void *data)
int
be_destroy(libbe_handle_t *lbh, const char *name, int options)
{
char origin[BE_MAXPATHLEN], path[BE_MAXPATHLEN];
zfs_handle_t *fs;
char path[BE_MAXPATHLEN];
char *p;
int err, force, mounted;
p = path;
force = options & BE_DESTROY_FORCE;
*origin = '\0';
be_root_concat(lbh, name, path);
@ -222,17 +223,21 @@ be_destroy(libbe_handle_t *lbh, const char *name, int options)
return (set_error(lbh, BE_ERR_DESTROYACT));
fs = zfs_open(lbh->lzh, p, ZFS_TYPE_FILESYSTEM);
if (fs == NULL)
return (set_error(lbh, BE_ERR_ZFSOPEN));
if ((options & BE_DESTROY_ORIGIN) != 0 &&
zfs_prop_get(fs, ZFS_PROP_ORIGIN, origin, sizeof(origin),
NULL, NULL, 0, 1) != 0)
return (set_error(lbh, BE_ERR_NOORIGIN));
} else {
if (!zfs_dataset_exists(lbh->lzh, path, ZFS_TYPE_SNAPSHOT))
return (set_error(lbh, BE_ERR_NOENT));
fs = zfs_open(lbh->lzh, p, ZFS_TYPE_SNAPSHOT);
if (fs == NULL)
return (set_error(lbh, BE_ERR_ZFSOPEN));
}
if (fs == NULL)
return (set_error(lbh, BE_ERR_ZFSOPEN));
/* Check if mounted, unmount if force is specified */
if ((mounted = zfs_is_mounted(fs, NULL)) != 0) {
if (force)
@ -248,6 +253,17 @@ be_destroy(libbe_handle_t *lbh, const char *name, int options)
return (set_error(lbh, BE_ERR_UNKNOWN));
}
if (*origin != '\0') {
fs = zfs_open(lbh->lzh, origin, ZFS_TYPE_SNAPSHOT);
if (fs == NULL)
return (set_error(lbh, BE_ERR_ZFSOPEN));
err = zfs_destroy(fs, false);
if (err == EBUSY)
return (set_error(lbh, BE_ERR_DESTROYMNT));
else if (err != 0)
return (set_error(lbh, BE_ERR_UNKNOWN));
}
return (0);
}

5
lib/libbe/be.h
View File

@ -93,7 +93,8 @@ int be_rename(libbe_handle_t *, const char *, const char *);
/* Bootenv removal functions */
typedef enum {
BE_DESTROY_FORCE = 1 << 0,
BE_DESTROY_FORCE = 1 << 0,
BE_DESTROY_ORIGIN = 1 << 1,
} be_destroy_opt_t;
int be_destroy(libbe_handle_t *, const char *, int);
@ -102,7 +103,7 @@ int be_destroy(libbe_handle_t *, const char *, int);
typedef enum {
BE_MNT_FORCE = 1 << 0,
BE_MNT_DEEP = 1 << 1,
BE_MNT_DEEP = 1 << 1,
} be_mount_opt_t;
int be_mount(libbe_handle_t *, char *, char *, int, char *);