Skip to content

Commit

Permalink
FreeBSD: bring back possibility to rewind the checkpoint from bootloader
Browse files Browse the repository at this point in the history
Add parsing of the rewind options.

When I was upstreaming the change [1], I omitted the part where we
detect that the pool should be rewind. When the FreeBSD repo has
synced with the OpenZFS, this part of the code was removed.

[1] FreeBSD repo: 277f38abffc6a8160b5044128b5b2c620fbb970c
[2] OpenZFS repo: f2c027b

External-issue: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=254152
Originally reviewed by: tsoome, allanjude
Originally reviewed by: kevans (ok from high-level overview)
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Mariusz Zaborski <oshogbo@vexillium.org>
Closes openzfs#11730
  • Loading branch information
oshogbo authored and Ryan Moeller committed May 6, 2021
1 parent e1a9372 commit 50de060
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion module/os/freebsd/zfs/zfs_vfsops.c
Original file line number Diff line number Diff line change
Expand Up @@ -1290,6 +1290,18 @@ getpoolname(const char *osname, char *poolname)
return (0);
}

static void
fetch_osname_options(char *name, bool *checkpointrewind)
{

if (name[0] == '!') {
*checkpointrewind = true;
memmove(name, name + 1, strlen(name));
} else {
*checkpointrewind = false;
}
}

/*ARGSUSED*/
static int
zfs_mount(vfs_t *vfsp)
Expand All @@ -1300,6 +1312,7 @@ zfs_mount(vfs_t *vfsp)
char *osname;
int error = 0;
int canwrite;
bool checkpointrewind;

if (vfs_getopt(vfsp->mnt_optnew, "from", (void **)&osname, NULL))
return (SET_ERROR(EINVAL));
Expand All @@ -1313,6 +1326,8 @@ zfs_mount(vfs_t *vfsp)
secpolicy_fs_mount_clearopts(cr, vfsp);
}

fetch_osname_options(osname, &checkpointrewind);

/*
* Check for mount privilege?
*
Expand Down Expand Up @@ -1391,7 +1406,7 @@ zfs_mount(vfs_t *vfsp)

error = getpoolname(osname, pname);
if (error == 0)
error = spa_import_rootpool(pname, false);
error = spa_import_rootpool(pname, checkpointrewind);
if (error)
goto out;
}
Expand Down

0 comments on commit 50de060

Please sign in to comment.